define HAVE_IOSTREAM_WITHASSIGN_STREAMBUF

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

diff --git a/include/fcgios.h b/include/fcgios.h
index c6a5e5e..4e23085 100755 (executable)
--- a/include/fcgios.h
+++ b/include/fcgios.h
@@ -18,12 +18,14 @@
 #ifndef _FCGIOS_H
 #define _FCGIOS_H
 
-#include "fcgi_config.h"
-
 #ifdef _WIN32
-#include <io.h>
+#define WIN32_LEAN_AND_MEAN 
+#include <windows.h>
+#include <winsock2.h>
 #endif
 
+#include "fcgi_config.h"
+
 #ifdef HAVE_SYS_TIME_H
 #include <sys/time.h>
 #endif
@@ -32,28 +34,26 @@
 extern "C" {
 #endif
 
-
 #ifdef _WIN32
-
 #define OS_Errno GetLastError()
 #define OS_SetErrno(err) SetLastError(err)
-
-#ifndef DLLAPI
-#define DLLAPI __declspec(dllimport)
-#endif
-
 #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 /* !_WIN32 */
 
+#ifndef DLLAPI
+#ifdef _WIN32
+#define DLLAPI __declspec(dllimport)
+#else
+#define DLLAPI
+#endif
+#endif
+
+
 /* 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
  * a drop-dead timer.  Its only used for AF_UNIX sockets (not TCP sockets).
@@ -117,6 +117,8 @@ DLLAPI int OS_IpcClose(int ipcFd);
 DLLAPI int OS_IsFcgi(int sock);
 DLLAPI void OS_SetFlags(int fd, int flags);
 
+DLLAPI void OS_ShutdownPending(void);
+
 #if defined (__cplusplus) || defined (c_plusplus)
 } /* terminate extern "C" { */
 #endif