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

diff --git a/lib/setup.h b/lib/setup.h
index 3eb6718ee098781cbae5ff2fc408e06d04e37481..867a00851630c4fe97837adda2dee4f50fab97af 100644 (file)
--- 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 a2e9665bbc381d8a0e41ff1536964a038b8f73a0..bb9c0a174d9e73179a2401d19ba7f21ac3ae8d9f 100644 (file)
--- 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 2bb3f8e79fd55338f802ec92e9902db9217b92f3..0394d80e2b68de444948a3867c26b0441e4bb928 100644 (file)
--- 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 c0e29fcb5a7339caa07b5a60052ccbc180df00aa..c66b8e1430783984fd69871f4ac53dbed3d2853a 100644 (file)
--- 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