Merge pull request #16 from tehnick/fix-static-lib-in-windows

Fix static library for MS Windows (for builds using MinGW)
FastCGI-Archives · Jan 26, 2019 · 1f49caa · 1f49caa
2 parents 372b13d + 476b80e
commit 1f49caa
Show file tree

Hide file tree

Showing 8 changed files with 4 additions and 18 deletions.
diff --git a/include/fcgi_stdio.h b/include/fcgi_stdio.h
@@ -24,7 +24,7 @@ extern "C" {
 #endif
 
 #ifndef DLLAPI
-#ifdef _WIN32
+#if defined (_WIN32) && defined (_MSC_VER)
 #define DLLAPI __declspec(dllimport)
 #else
 #define DLLAPI

diff --git a/include/fcgiapp.h b/include/fcgiapp.h
@@ -23,7 +23,7 @@
 #endif
 
 #ifndef DLLAPI
-#ifdef _WIN32
+#if defined (_WIN32) && defined (_MSC_VER)
 #define DLLAPI __declspec(dllimport)
 #else
 #define DLLAPI

diff --git a/include/fcgio.h b/include/fcgio.h
@@ -35,7 +35,7 @@
 #include "fcgiapp.h"
 
 #ifndef DLLAPI
-#ifdef _WIN32
+#if defined (_WIN32) && defined (_MSC_VER)
 #define DLLAPI __declspec(dllimport)
 #else
 #define DLLAPI

diff --git a/include/fcgios.h b/include/fcgios.h
@@ -50,7 +50,7 @@ extern "C" {
 #endif /* !_WIN32 */
 
 #ifndef DLLAPI
-#ifdef _WIN32
+#if defined (_WIN32) && defined (_MSC_VER)
 #define DLLAPI __declspec(dllimport)
 #else
 #define DLLAPI

diff --git a/libfcgi/fcgi_stdio.c b/libfcgi/fcgi_stdio.c
@@ -22,10 +22,6 @@
 #include <unistd.h>
 #endif
 
-#ifdef _WIN32
-#define DLLAPI  __declspec(dllexport)
-#endif
-
 #include "fcgiapp.h"
 #include "fcgios.h"
 #include "fcgimisc.h"

diff --git a/libfcgi/fcgiapp.c b/libfcgi/fcgiapp.c
@@ -40,10 +40,6 @@
 #include <limits.h>
 #endif
 
-#ifdef _WIN32
-#define DLLAPI  __declspec(dllexport)
-#endif
-
 #include "fcgimisc.h"
 #include "fastcgi.h"
 #include "fcgios.h"

diff --git a/libfcgi/fcgio.cpp b/libfcgi/fcgio.cpp
@@ -18,10 +18,6 @@
 // implied; without even the implied warranty of MERCHANTABILITY or
 // FITNESS FOR A PARTICULAR PURPOSE.
 
-#ifdef _WIN32
-#define DLLAPI  __declspec(dllexport)
-#endif
-
 #include <stdio.h>
 #include <limits.h>
 #include "fcgio.h"

diff --git a/libfcgi/os_win32.c b/libfcgi/os_win32.c
@@ -27,8 +27,6 @@
 #include <process.h>
 #include <signal.h>
 
-#define DLLAPI  __declspec(dllexport)
-
 #include "fcgimisc.h"
 #include "fcgios.h"