From: Gunter Knauf <gk@gknw.de>
Date: Sat, 30 Jun 2007 23:45:57 +0000 (+0000)
Subject: moved includes to setup.h so that the project headers also pick them up (eleminate... 
X-Git-Tag: curl-7_16_4~36
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ca3e5a6322c8e9b18dd5dd3997d6e5a06216cbf1;p=thirdparty%2Fcurl.git

moved includes to setup.h so that the project headers also pick them up (eleminate gcc warning).
---

diff --git a/lib/setup.h b/lib/setup.h
index 3eb6718ee0..867a008516 100644
--- a/lib/setup.h
+++ b/lib/setup.h
@@ -315,6 +315,10 @@ int fileno( FILE *stream);
 #endif
 
 #ifdef NETWARE
+#ifndef __NOVELL_LIBC__
+#include <sys/bsdskt.h>
+#include <sys/timeval.h>
+#endif
 #undef HAVE_ALARM
 #endif
 
diff --git a/lib/timeval.c b/lib/timeval.c
index a2e9665bbc..bb9c0a174d 100644
--- a/lib/timeval.c
+++ b/lib/timeval.c
@@ -68,9 +68,6 @@ static int gettimeofday(struct timeval *tp, void *nothing)
 }
 #else /* WIN32 */
 /* non-win32 version of Curl_gettimeofday() */
-#if (defined(NETWARE) && !defined(__NOVELL_LIBC__))
-#include <sys/timeval.h>
-#endif
 static int gettimeofday(struct timeval *tp, void *nothing)
 {
   (void)nothing; /* we don't support specific time-zones */
diff --git a/src/curlutil.c b/src/curlutil.c
index 2bb3f8e79f..0394d80e2b 100644
--- a/src/curlutil.c
+++ b/src/curlutil.c
@@ -70,9 +70,6 @@ static int gettimeofday(struct timeval *tp, void *nothing)
 }
 #else /* WIN32 */
 /* non-win32 version of Curl_gettimeofday() */
-#if (defined(NETWARE) && !defined(__NOVELL_LIBC__))
-#include <sys/timeval.h>
-#endif
 static int gettimeofday(struct timeval *tp, void *nothing)
 {
   (void)nothing; /* we don't support specific time-zones */
diff --git a/src/setup.h b/src/setup.h
index c0e29fcb5a..c66b8e1430 100644
--- a/src/setup.h
+++ b/src/setup.h
@@ -176,6 +176,10 @@ int fileno( FILE *stream);
 #define typedef_bool
 #endif
 
+#if (defined(NETWARE) && !defined(__NOVELL_LIBC__))
+#include <sys/timeval.h>
+#endif
+
 #ifndef SIZEOF_CURL_OFF_T
 #define SIZEOF_CURL_OFF_T sizeof(curl_off_t)
 #endif