my assert.h takes extra pains to be certain to _re-include_

itself if you include it twice. this is dumb, but hey.

svn:r2653

diff --git a/src/common/compat.c b/src/common/compat.c
index 649d99e8fc661e454244c53d2bd123a9b92613b6..6ce26afc41f0f5386c62d9d8afa27b600afa1abd 100644 (file)
--- a/src/common/compat.c
+++ b/src/common/compat.c
@@ -63,6 +63,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <assert.h>
 
 #include "compat.h"
 #include "log.h"

diff --git a/src/common/container.c b/src/common/container.c
index 8eea7438adde46e7ca1b3665f2a049141c41cec2..c7602d14b081ef00a6c3f0c14f9fe0678d09de7c 100644 (file)
--- a/src/common/container.c
+++ b/src/common/container.c
@@ -13,7 +13,7 @@
 #endif
 #include <stdlib.h>
 #include <string.h>
-
+#include <assert.h>
 
 /* =====
  * smartlist_t: a simple resizeable array abstraction.

diff --git a/src/common/util.h b/src/common/util.h
index ae5ab9dc57ac3c33d9b5eb619825f6f7973b94bc..6e674e4180e3528fd3d8ce624ac1d77b449028ca 100644 (file)
--- a/src/common/util.h
+++ b/src/common/util.h
@@ -13,7 +13,6 @@
 #include "orconfig.h"
 #include "torint.h"
 #include <stdio.h>
-#include <assert.h>
 #ifdef HAVE_SYS_TIME_H
 #include <sys/time.h>
 #endif