aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorYang Tse <yangsita@gmail.com>2007-02-20 12:12:27 +0000
committerYang Tse <yangsita@gmail.com>2007-02-20 12:12:27 +0000
commit29bb6f65f1ac786b189ca6e860b463c5142bc486 (patch)
treee42f0cad0d307136e66594a443ec5ab34bd9eb1a /lib
parent37f07a54bdb48b2fd1a564a054d20a576f4de342 (diff)
Move header file inclusion logic and definition of timeval
struct for platforms that don't have it to setup_once.h
Diffstat (limited to 'lib')
-rw-r--r--lib/setup_once.h41
-rw-r--r--lib/timeval.h21
2 files changed, 41 insertions, 21 deletions
diff --git a/lib/setup_once.h b/lib/setup_once.h
index 2cf4ebea4..190b69ed7 100644
--- a/lib/setup_once.h
+++ b/lib/setup_once.h
@@ -38,8 +38,49 @@
* Inclusion of common header files.
*/
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <stdarg.h>
+#include <ctype.h>
#include <errno.h>
+#ifdef HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+
+#ifdef HAVE_SYS_STAT_H
+#include <sys/stat.h>
+#endif
+
+#ifdef HAVE_SYS_TIME_H
+#include <sys/time.h>
+#ifdef TIME_WITH_SYS_TIME
+#include <time.h>
+#endif
+#else
+#ifdef HAVE_TIME_H
+#include <time.h>
+#endif
+#endif
+
+#ifdef WIN32
+#include <io.h>
+#include <fcntl.h>
+#endif
+
+
+/*
+ * Definition of timeval struct for platforms that don't have it.
+ */
+
+#ifndef HAVE_STRUCT_TIMEVAL
+struct timeval {
+ long tv_sec;
+ long tv_usec;
+};
+#endif
+
/*
* If we have the MSG_NOSIGNAL define, make sure we use
diff --git a/lib/timeval.h b/lib/timeval.h
index 6c55a71ba..565409a2f 100644
--- a/lib/timeval.h
+++ b/lib/timeval.h
@@ -30,27 +30,6 @@
#include "setup.h"
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-#ifdef HAVE_SYS_TIME_H
-#include <sys/time.h>
-#ifdef TIME_WITH_SYS_TIME
-#include <time.h>
-#endif
-#else
-#ifdef HAVE_TIME_H
-#include <time.h>
-#endif
-#endif
-
-#ifndef HAVE_STRUCT_TIMEVAL
-struct timeval {
- long tv_sec;
- long tv_usec;
-};
-#endif
-
struct timeval curlx_tvnow(void);
/*