From: Roger Dingledine <arma@torproject.org>
Date: Wed, 3 Nov 2004 07:29:03 +0000 (+0000)
Subject: my assert.h takes extra pains to be certain to _re-include_
X-Git-Tag: debian-version-0.0.8+0.0.9pre5-1~128
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e761cc97509ee712c1ace5bf878756f5d418eaaa;p=thirdparty%2Ftor.git

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 649d99e8fc..6ce26afc41 100644
--- 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 8eea7438ad..c7602d14b0 100644
--- 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 ae5ab9dc57..6e674e4180 100644
--- 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