more header juggling

[catagits/fcgi2.git] / include / fcgios.h

diff --git a/include/fcgios.h b/include/fcgios.h
index 47fcea1..6c33638 100755 (executable)
--- a/include/fcgios.h
+++ b/include/fcgios.h
@@ -18,21 +18,41 @@
 #ifndef _FCGIOS_H
 #define _FCGIOS_H
 
+#include "fcgi_config.h"
+
+#ifdef _WIN32
+#include <io.h>
+#endif
+
+#ifdef HAVE_SYS_TIME_H
+#include <sys/time.h>
+#endif
+
+#if defined (c_plusplus) || defined (__cplusplus)
+extern "C" {
+#endif
+
+
 #ifdef _WIN32
+
 #define OS_Errno GetLastError()
 #define OS_SetErrno(err) SetLastError(err)
+
 #ifndef DLLAPI
 #define DLLAPI __declspec(dllimport)
 #endif
-#else
+
+#ifndef O_NONBLOCK
+#define O_NONBLOCK     0x0004  /* no delay */
+#endif
+
+#else /* !_WIN32 */
+
 #define DLLAPI
 #define OS_Errno errno
 #define OS_SetErrno(err) errno = (err)
-#endif
 
-#ifdef _WIN32
-#include <io.h>
-#endif
+#endif /* !_WIN32 */
 
 /* This is the initializer for a "struct timeval" used in a select() call
  * right after a new request is accept()ed to determine readablity.  Its
@@ -49,7 +69,6 @@
 #define STDIN_FILENO  0
 #endif
 
-
 #ifndef STDOUT_FILENO
 #define STDOUT_FILENO 1
 #endif
@@ -66,16 +85,6 @@
 #define X_OK       0x01
 #endif
 
-#ifdef _WIN32
-#ifndef O_NONBLOCK
-#define O_NONBLOCK     0x0004  /* no delay */
-#endif
-#endif
-
-#if defined (c_plusplus) || defined (__cplusplus)
-extern "C" {
-#endif
-
 #ifndef _CLIENTDATA
 #   if defined(__STDC__) || defined(__cplusplus)
     typedef void *ClientData;