[or-cvs] remove popt dependency, consolidate config stuff

Roger Dingledine arma at seul.org
Sat Nov 23 06:49:03 UTC 2002


Update of /home/or/cvsroot/src/common
In directory moria.seul.org:/home/arma/work/onion/cvs/src/common

Modified Files:
	Makefile.am crypto.c 
Removed Files:
	config.c config.h 
Log Message:
remove popt dependency, consolidate config stuff
reformat parts of onion.c


Index: Makefile.am
===================================================================
RCS file: /home/or/cvsroot/src/common/Makefile.am,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- Makefile.am	3 Sep 2002 18:44:23 -0000	1.6
+++ Makefile.am	23 Nov 2002 06:49:01 -0000	1.7
@@ -3,9 +3,7 @@
 
 #CFLAGS  = -Wall -Wpointer-arith -O2
 
-libor_a_SOURCES = config.c log.c utils.c crypto.c fakepoll.c
+libor_a_SOURCES = log.c utils.c crypto.c fakepoll.c
 
-noinst_HEADERS = config.h log.h \
-		     policies.h utils.h \
-                     ss.h version.h crypto.h fakepoll.h
+noinst_HEADERS = log.h policies.h utils.h ss.h version.h crypto.h fakepoll.h
 

Index: crypto.c
===================================================================
RCS file: /home/or/cvsroot/src/common/crypto.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- crypto.c	2 Oct 2002 20:39:51 -0000	1.9
+++ crypto.c	23 Nov 2002 06:49:01 -0000	1.10
@@ -15,7 +15,7 @@
 #include <assert.h>
 
 #include "crypto.h"
-#include "config.h"
+#include "../or/or.h"
 #include "log.h"
 
 #if OPENSSL_VERSION_NUMBER < 0x00905000l

--- config.c DELETED ---

--- config.h DELETED ---



More information about the tor-commits mailing list