summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert James Kaes <rjkaes@users.sourceforge.net>2001-06-06 19:33:26 +0000
committerRobert James Kaes <rjkaes@users.sourceforge.net>2001-06-06 19:33:26 +0000
commitace480bb657605cb9e77918efd3dccc8bb574a45 (patch)
treec6e79130d0ac0d14cc3ac9381f761ddc11c26866
parentff97b38603e10338aa0241b20cac478a5ca508fc (diff)
downloadtinyproxy-ace480bb657605cb9e77918efd3dccc8bb574a45.tar.gz
tinyproxy-ace480bb657605cb9e77918efd3dccc8bb574a45.zip
Fixed the include order to better handle the sys/time.h and time.h
headers.
Diffstat (limited to '')
-rw-r--r--src/tinyproxy.h14
1 files changed, 11 insertions, 3 deletions
diff --git a/src/tinyproxy.h b/src/tinyproxy.h
index 426cf6a..de0fed7 100644
--- a/src/tinyproxy.h
+++ b/src/tinyproxy.h
@@ -1,4 +1,4 @@
-/* $Id: tinyproxy.h,v 1.9 2001-06-02 02:07:34 rjkaes Exp $
+/* $Id: tinyproxy.h,v 1.10 2001-06-06 19:33:26 rjkaes Exp $
*
* See 'tinyproxy.c' for a detailed description.
*
@@ -31,7 +31,16 @@
#endif
#include <sys/socket.h>
#include <sys/stat.h>
-#include <sys/time.h>
+#ifdef TIME_WITH_SYS_TIME
+# include <sys/time.h>
+# include <time.h>
+#else
+# ifdef HAVE_SYS_TIME_H
+# include <sys/time.h>
+# else
+# include <time.h>
+# endif
+#endif
#include <sys/types.h>
#include <sys/uio.h>
#include <arpa/inet.h>
@@ -51,7 +60,6 @@
#ifdef HAVE_STRINGS_H
# include <strings.h>
#endif
-#include <time.h>
#include <unistd.h>
#include <assert.h>