[or-cvs] Remove redundant includes. They are all hanled in torint.h...

Peter Palfrader weasel at seul.org
Mon Apr 10 19:39:28 UTC 2006


Update of /home/or/cvsroot/tor/src/or
In directory moria:/tmp/cvs-serv5563/src/or

Modified Files:
	or.h 
Log Message:
Remove redundant includes.  They are all hanled in torint.h which we already do include.

Index: or.h
===================================================================
RCS file: /home/or/cvsroot/tor/src/or/or.h,v
retrieving revision 1.824
retrieving revision 1.825
diff -u -p -d -r1.824 -r1.825
--- or.h	10 Apr 2006 01:35:56 -0000	1.824
+++ or.h	10 Apr 2006 19:39:26 -0000	1.825
@@ -22,7 +22,6 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include <limits.h>
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif
@@ -38,27 +37,10 @@
 #ifdef HAVE_CTYPE_H
 #include <ctype.h>
 #endif
-#include "../common/torint.h"
-#ifdef HAVE_INTTYPES_H
-#include <inttypes.h>
-#endif
 #ifdef HAVE_SYS_PARAM_H
 #include <sys/param.h> /* FreeBSD needs this to know what version it is */
 #endif
-#ifdef HAVE_SYS_LIMITS_H
-#include <sys/limits.h>
-#endif
-#ifdef HAVE_MACHINE_LIMITS_H
-#ifndef __FreeBSD__
-  /* FreeBSD has a bug where it complains that this file is obsolete,
-     and I should migrate to using sys/limits. It complains even when
-     I include both. */
-#include <machine/limits.h>
-#endif
-#endif
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h> /* Must be included before sys/stat.h for Ultrix */
-#endif
+#include "../common/torint.h"
 #ifdef HAVE_SYS_WAIT_H
 #include <sys/wait.h>
 #endif



More information about the tor-commits mailing list