header juggling

diff --git a/libfcgi/fcgi_stdio.c b/libfcgi/fcgi_stdio.c
index 0578d2e..8d8e7c5 100644 (file)
--- a/libfcgi/fcgi_stdio.c
+++ b/libfcgi/fcgi_stdio.c
@@ -12,7 +12,7 @@
  */
 
 #ifndef lint
-static const char rcsid[] = "$Id: fcgi_stdio.c,v 1.12 2001/06/20 16:04:17 robs Exp $";
+static const char rcsid[] = "$Id: fcgi_stdio.c,v 1.13 2001/06/22 14:29:20 robs Exp $";
 #endif /* not lint */
 
 #include <errno.h>  /* for errno */
@@ -26,16 +26,18 @@ static const char rcsid[] = "$Id: fcgi_stdio.c,v 1.12 2001/06/20 16:04:17 robs E
 #include <unistd.h>
 #endif
 
+#ifdef _WIN32
 #define DLLAPI  __declspec(dllexport)
-
-#define NO_FCGI_DEFINES
-#include "fcgi_stdio.h"
-#undef NO_FCGI_DEFINES
+#endif
 
 #include "fcgiapp.h"
 #include "fcgios.h"
 #include "fcgimisc.h"
 
+#define NO_FCGI_DEFINES
+#include "fcgi_stdio.h"
+#undef NO_FCGI_DEFINES
+
 #ifndef _WIN32
 
 extern char **environ;

diff --git a/libfcgi/os_win32.c b/libfcgi/os_win32.c
index 7f1f1c8..9af516f 100755 (executable)
--- a/libfcgi/os_win32.c
+++ b/libfcgi/os_win32.c
@@ -17,7 +17,7 @@
  *  significantly more enjoyable.)
  */
 #ifndef lint
-static const char rcsid[] = "$Id: os_win32.c,v 1.19 2001/06/22 03:00:18 robs Exp $";
+static const char rcsid[] = "$Id: os_win32.c,v 1.20 2001/06/22 14:28:29 robs Exp $";
 #endif /* not lint */
 
 #define WIN32_LEAN_AND_MEAN 
@@ -29,8 +29,9 @@ static const char rcsid[] = "$Id: os_win32.c,v 1.19 2001/06/22 03:00:18 robs Exp
 #include <sys/timeb.h>
 
 #define DLLAPI  __declspec(dllexport)
-#include "fcgios.h"
+
 #include "fcgimisc.h"
+#include "fcgios.h"
 
 #define WIN32_OPEN_MAX 128 /* XXX: Small hack */