undoing the r3773-r3774 experiment.

libtransmission/bencode.c

@@ -22,6 +22,7 @@
  * DEALINGS IN THE SOFTWARE.
  *****************************************************************************/
 
+#include <assert.h>
 #include <ctype.h> /* isdigit, isprint */
 #include <stdarg.h>
 #include <stdio.h>

libtransmission/completion.c

@@ -22,6 +22,7 @@
  * DEALINGS IN THE SOFTWARE.
  *****************************************************************************/
 
+#include <assert.h>
 #include <string.h>
 
 #include "transmission.h"

libtransmission/crypto.c

@@ -11,6 +11,7 @@
  */
 
 #include <sys/types.h> /* for event.h, as well as netinet/in.h on some platforms */
+#include <assert.h>
 #include <inttypes.h> /* uint8_t */
 #include <string.h> /* memcpy */
 #include <stdarg.h>

libtransmission/fastresume.c

@@ -41,6 +41,7 @@
  * so the resume file will not be read).
  **********************************************************************/
 
+#include <assert.h>
 #include <errno.h>
 #include <stdio.h>
 #include <stdlib.h>

libtransmission/fdlimit.c

@@ -22,6 +22,7 @@
  * DEALINGS IN THE SOFTWARE.
  *****************************************************************************/
 
+#include <assert.h>
 #include <errno.h>
 #include <inttypes.h>
 #include <stdio.h>

libtransmission/handshake.c

@@ -10,6 +10,7 @@
  * $Id$
  */
 
+#include <assert.h>
 #include <errno.h>
 #include <inttypes.h>
 #include <limits.h> /* UCHAR_MAX */

libtransmission/inout.c

@@ -10,6 +10,7 @@
  * $Id$
  */
 
+#include <assert.h>
 #include <stdlib.h>
 #include <string.h>
 

libtransmission/ipcparse.c

@@ -22,6 +22,7 @@
  * DEALINGS IN THE SOFTWARE.
  *****************************************************************************/
 
+#include <assert.h>
 #include <errno.h>
 #include <limits.h>
 #include <stdio.h>

libtransmission/makemeta.c

@@ -10,6 +10,7 @@
  * $Id$
  */
 
+#include <assert.h>
 #include <errno.h>
 #include <math.h>
 #include <stdio.h> /* FILE, snprintf, stderr */

libtransmission/metainfo.c

@@ -22,6 +22,7 @@
  * DEALINGS IN THE SOFTWARE.
  *****************************************************************************/
 
+#include <assert.h>
 #include <errno.h>
 #include <stdio.h>
 #include <stdlib.h>

libtransmission/natpmp.c

@@ -22,6 +22,7 @@
  * DEALINGS IN THE SOFTWARE.
  *****************************************************************************/
 
+#include <assert.h>
 #include <errno.h>
 #include <stdlib.h>
 #include <string.h>

libtransmission/peer-io.c

@@ -10,6 +10,7 @@
  * $Id$
  */
 
+#include <assert.h>
 #include <string.h>
 #include <stdio.h>
 #include <unistd.h>

libtransmission/peer-mgr.c

@@ -10,6 +10,7 @@
  * $Id$
  */
 
+#include <assert.h>
 #include <string.h> /* memcpy, memcmp */
 #include <stdlib.h> /* qsort */
 #include <stdio.h> /* printf */

libtransmission/peer-msgs.c

@@ -10,6 +10,7 @@
  * $Id$
  */
 
+#include <assert.h>
 #include <ctype.h>
 #include <errno.h>
 #include <stdio.h>

libtransmission/platform.c

@@ -22,6 +22,7 @@
  * DEALINGS IN THE SOFTWARE.
  *****************************************************************************/
 
+#include <assert.h>
 #include <errno.h>
 #include <stdio.h>
 #include <stdlib.h>

libtransmission/ptrarray.c

@@ -10,6 +10,7 @@
  * $Id$
  */
 
+#include <assert.h>
 #include <stdlib.h>
 #include <string.h> /* memmove */
 

libtransmission/publish.c

@@ -10,6 +10,7 @@
  * $Id$
  */
 
+#include <assert.h>
 #include "list.h"
 #include "publish.h"
 #include "utils.h"

libtransmission/shared.c

@@ -22,6 +22,7 @@
  * DEALINGS IN THE SOFTWARE.
  *****************************************************************************/
 
+#include <assert.h>
 #include <stdlib.h>
 #include <string.h>
 #include <stdio.h>

libtransmission/torrent.c

@@ -22,6 +22,7 @@
  * DEALINGS IN THE SOFTWARE.
  *****************************************************************************/
 
+#include <assert.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>

libtransmission/tracker.c

@@ -10,6 +10,7 @@
  * $Id$
  */
 
+#include <assert.h>
 #include <ctype.h> /* isalnum */
 #include <stdio.h> /* snprintf */
 #include <stdlib.h>

libtransmission/transmission.c

@@ -22,6 +22,7 @@
  * DEALINGS IN THE SOFTWARE.
  *****************************************************************************/
 
+#include <assert.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>

libtransmission/trevent.c

@@ -10,6 +10,7 @@
  * $Id$
  */
 
+#include <assert.h>
 #include <errno.h>
 #include <stdlib.h>
 #include <string.h>

libtransmission/utils.c

@@ -22,6 +22,7 @@
  * DEALINGS IN THE SOFTWARE.
  *****************************************************************************/
 
+#include <assert.h>
 #include <ctype.h>
 #include <errno.h>
 #include <stdarg.h>

libtransmission/utils.h

@@ -90,17 +90,6 @@ void tr_wait( uint64_t delay_milliseconds );
 ****
 ***/
 
-#ifdef SYS_DARWIN
-#include <Foundation/NSException.h>
-#define assert(A) NSCParameterAssert(A)
-#else
-#include <assert.h>
-#endif
-
-/***
-****
-***/
-
 #define tr_new(struct_type, n_structs)           \
     ((struct_type *) tr_malloc (((size_t) sizeof (struct_type)) * ((size_t) (n_structs))))
 #define tr_new0(struct_type, n_structs)          \