[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
[or-cvs] my assert.h takes extra pains to be certain to _re-include_
- To: or-cvs@freehaven.net
- Subject: [or-cvs] my assert.h takes extra pains to be certain to _re-include_
- From: arma@seul.org (Roger Dingledine)
- Date: Wed, 3 Nov 2004 02:29:05 -0500 (EST)
- Delivered-to: archiver@seul.org
- Delivered-to: or-cvs-outgoing@seul.org
- Delivered-to: or-cvs@seul.org
- Delivery-date: Wed, 03 Nov 2004 02:29:35 -0500
- Reply-to: or-dev@freehaven.net
- Sender: owner-or-cvs@freehaven.net
Update of /home/or/cvsroot/src/common
In directory moria.mit.edu:/home2/arma/work/onion/cvs/src/common
Modified Files:
compat.c container.c util.h
Log Message:
my assert.h takes extra pains to be certain to _re-include_
itself if you include it twice. this is dumb, but hey.
Index: compat.c
===================================================================
RCS file: /home/or/cvsroot/src/common/compat.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- compat.c 2 Nov 2004 19:25:52 -0000 1.3
+++ compat.c 3 Nov 2004 07:29:03 -0000 1.4
@@ -63,6 +63,7 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
+#include <assert.h>
#include "compat.h"
#include "log.h"
Index: container.c
===================================================================
RCS file: /home/or/cvsroot/src/common/container.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- container.c 1 Nov 2004 20:41:46 -0000 1.1
+++ container.c 3 Nov 2004 07:29:03 -0000 1.2
@@ -13,7 +13,7 @@
#endif
#include <stdlib.h>
#include <string.h>
-
+#include <assert.h>
/* =====
* smartlist_t: a simple resizeable array abstraction.
Index: util.h
===================================================================
RCS file: /home/or/cvsroot/src/common/util.h,v
retrieving revision 1.111
retrieving revision 1.112
diff -u -d -r1.111 -r1.112
--- util.h 2 Nov 2004 19:25:52 -0000 1.111
+++ util.h 3 Nov 2004 07:29:03 -0000 1.112
@@ -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