Change the ordering on DLLAPI define, only define if not defined (unix case).

diff --git a/include/fcgi_stdio.h b/include/fcgi_stdio.h
index a32ad18..de2af89 100644 (file)
--- a/include/fcgi_stdio.h
+++ b/include/fcgi_stdio.h
@@ -9,7 +9,7 @@
  * See the file "LICENSE.TERMS" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * $Id: fcgi_stdio.h,v 1.4 1999/06/09 03:27:25 roberts Exp $
+ * $Id: fcgi_stdio.h,v 1.5 2001/06/22 13:21:15 robs Exp $
  */
 
 #ifndef _FCGI_STDIO
@@ -23,13 +23,13 @@
 extern "C" {
 #endif
 
-#ifdef _WIN32
 #ifndef DLLAPI
+#ifdef _WIN32
 #define DLLAPI __declspec(dllimport)
-#endif
 #else
 #define DLLAPI
 #endif
+#endif
 
 /*
  * Wrapper type for FILE

diff --git a/include/fcgiapp.h b/include/fcgiapp.h
index cea1711..30b1916 100644 (file)
--- a/include/fcgiapp.h
+++ b/include/fcgiapp.h
@@ -9,7 +9,7 @@
  * See the file "LICENSE.TERMS" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * $Id: fcgiapp.h,v 1.6 2001/06/22 13:17:18 skimo Exp $
+ * $Id: fcgiapp.h,v 1.7 2001/06/22 13:21:15 robs Exp $
  */
 
 #ifndef _FCGIAPP_H
@@ -26,17 +26,13 @@
 extern "C" {
 #endif
 
-#ifdef _WIN32
-
 #ifndef DLLAPI
+#ifdef _WIN32
 #define DLLAPI __declspec(dllimport)
-#endif
-
-#else  /* !_WIN32 */
-
+#else
 #define DLLAPI
-
-#endif /* !_WIN32 */
+#endif
+#endif
 
 /*
  * Error codes.  Assigned to avoid conflict with EOF and errno(2).

diff --git a/include/fcgiappmisc.h b/include/fcgiappmisc.h
index a8f0f6c..55d0629 100644 (file)
--- a/include/fcgiappmisc.h
+++ b/include/fcgiappmisc.h
@@ -11,7 +11,7 @@
  * See the file "LICENSE.TERMS" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * $Id: fcgiappmisc.h,v 1.1 1997/09/16 15:36:32 stanleyg Exp $
+ * $Id: fcgiappmisc.h,v 1.2 2001/06/22 13:21:15 robs Exp $
  */
 
 #ifndef _FCGIAPPMISC_H
@@ -23,13 +23,13 @@
 extern "C" {
 #endif
 
-#ifdef _WIN32
 #ifndef DLLAPI
+#ifdef _WIN32
 #define DLLAPI __declspec(dllimport)
-#endif
 #else
 #define DLLAPI
 #endif
+#endif
 
 DLLAPI FCGX_Stream *CreateWriter(
         int socket,

diff --git a/include/fcgios.h b/include/fcgios.h
index 8c48f09..02e033c 100755 (executable)
--- a/include/fcgios.h
+++ b/include/fcgios.h
@@ -37,18 +37,23 @@ extern "C" {
 #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).