Commit 714788b1 authored by Nick Mathewson's avatar Nick Mathewson 🦀
Browse files

Remove non-windows system includes from compat.h and util.h

parent 71e56c70

src/common/compat.h

+0 −42
Original line number Diff line number Diff line
@@ -9,35 +9,6 @@ 
#include "orconfig.h"

#include "lib/cc/torint.h"

#include "lib/testsupport/testsupport.h"

#ifdef HAVE_SYS_PARAM_H

#include <sys/param.h>

#endif

#ifdef HAVE_SYS_TYPES_H

#include <sys/types.h>

#endif

#ifdef HAVE_SYS_TIME_H

#include <sys/time.h>

#endif

#ifdef HAVE_TIME_H

#include <time.h>

#endif

#ifdef HAVE_STRING_H

#include <string.h>

#endif

#include <stdarg.h>

#ifdef HAVE_SYS_RESOURCE_H

#include <sys/resource.h>

#endif

#ifdef HAVE_SYS_SOCKET_H

#include <sys/socket.h>

#endif

#ifdef HAVE_NETINET_IN_H

#include <netinet/in.h>

#endif

#ifdef HAVE_NETINET6_IN6_H

#include <netinet6/in6.h>

#endif



#include "lib/cc/compat_compiler.h"

#include "lib/arch/bytes.h"

#include "lib/time/compat_time.h"
@@ -53,19 +24,6 @@ 
#include "lib/fs/userdb.h"

#include "lib/wallclock/timeval.h"

#include "lib/intmath/cmp.h"



#include <stdio.h>

#include <errno.h>



/* ===== Time compatibility */



/* ===== File compatibility */



/* ===== Net compatibility */



/* ===== OS compatibility */



/* This needs some of the declarations above so we include it here. */

#include "lib/thread/threads.h"



#endif /* !defined(TOR_COMPAT_H) */

src/common/util.h

+0 −10
Original line number Diff line number Diff line
@@ -16,8 +16,6 @@ 
#include "common/compat.h"

#include "lib/ctime/di_ops.h"

#include "lib/testsupport/testsupport.h"

#include <stdio.h>

#include <stdlib.h>

#include "lib/err/torerr.h"

#include "lib/malloc/util_malloc.h"

#include "lib/wallclock/approx_time.h"
@@ -38,12 +36,4 @@ 
#include "lib/encoding/time_fmt.h"

#include "lib/encoding/cstring.h"



/* Math functions */



/* String manipulation */



/* Time helpers */



/* File helpers */



#endif /* !defined(TOR_UTIL_H) */

src/common/workqueue.c

+1 −0
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ 
#include "lib/intmath/weakrng.h"



#include <event2/event.h>

#include <string.h>



#define WORKQUEUE_PRIORITY_FIRST WQ_PRI_HIGH

#define WORKQUEUE_PRIORITY_LAST WQ_PRI_LOW

src/ext/csiphash.c

+3 −3
Original line number Diff line number Diff line
@@ -30,11 +30,11 @@ 
*/



#include "lib/cc/torint.h"

#include "lib/log/util_bug.h"



#include "siphash.h"

/* for tor_assert */

#include "common/util.h"

/* for memcpy */

#include <string.h>

#include <stdlib.h>

#include "byteorder.h"



#define ROTATE(x, b) (uint64_t)( ((x) << (b)) | ( (x) >> (64 - (b))) )

src/lib/arch/bytes.h

+1 −1
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ 
#ifndef TOR_BYTES_H

#define TOR_BYTES_H



#include <stdlib.h>

#include <string.h>

#include "lib/cc/torint.h"



/* The uint8 variants are defined to make the code more uniform. */