diff options
| author | Gunter Knauf <gk@gknw.de> | 2007-06-30 23:45:57 +0000 |
|---|---|---|
| committer | Gunter Knauf <gk@gknw.de> | 2007-06-30 23:45:57 +0000 |
| commit | ca3e5a6322c8e9b18dd5dd3997d6e5a06216cbf1 (patch) | |
| tree | 26fd8d2d8b5b1b6008caa4cfcdb30129d441054c | |
| parent | c4931601c6a9e5b51b002126fe484cc12fc9a4a9 (diff) | |
moved includes to setup.h so that the project headers also pick them up (eleminate gcc warning).
| -rw-r--r-- | lib/setup.h | 4 | ||||
| -rw-r--r-- | lib/timeval.c | 3 | ||||
| -rw-r--r-- | src/curlutil.c | 3 | ||||
| -rw-r--r-- | src/setup.h | 4 |
4 files changed, 8 insertions, 6 deletions
diff --git a/lib/setup.h b/lib/setup.h index 3eb6718ee..867a00851 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 a2e9665bb..bb9c0a174 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 2bb3f8e79..0394d80e2 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 c0e29fcb5..c66b8e143 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 |