summaryrefslogtreecommitdiff
path: root/pcreposix.h
diff options
context:
space:
mode:
authorph10 <ph10@2f5784b3-3f2a-0410-8824-cb99058d5e15>2007-07-31 14:39:09 +0000
committerph10 <ph10@2f5784b3-3f2a-0410-8824-cb99058d5e15>2007-07-31 14:39:09 +0000
commite188596ef3e912f62e3ae85c8da905a54fc41d8b (patch)
treeebd384645bf62c640a04fe0308bcbac05e8087e0 /pcreposix.h
parent235d0eb42c6281f0d8a1863f866c4d2722f0cdcf (diff)
downloadpcre-e188596ef3e912f62e3ae85c8da905a54fc41d8b.tar.gz
Daniel's patch for config.h and Windows DLL declarations (not fully working).
git-svn-id: svn://vcs.exim.org/pcre/code/trunk@199 2f5784b3-3f2a-0410-8824-cb99058d5e15
Diffstat (limited to 'pcreposix.h')
-rw-r--r--pcreposix.h11
1 files changed, 5 insertions, 6 deletions
diff --git a/pcreposix.h b/pcreposix.h
index cca559b..40ed406 100644
--- a/pcreposix.h
+++ b/pcreposix.h
@@ -107,13 +107,12 @@ typedef struct {
/* When an application links to a PCRE DLL in Windows, the symbols that are
imported have to be identified as such. When building PCRE, the appropriate
-export settings are needed. */
+export settings are needed, and are set in pcreposix.c before including this
+file. */
-#ifdef _WIN32
-# ifndef PCREPOSIX_STATIC
-# define PCREPOSIX_EXP_DECL extern __declspec(dllimport)
-# define PCREPOSIX_EXP_DEFN __declspec(dllimport)
-# endif
+#if defined(_WIN32) && !defined(PCRE_STATIC) && !defined(PCREPOSIX_EXP_DECL)
+# define PCREPOSIX_EXP_DECL extern __declspec(dllimport)
+# define PCREPOSIX_EXP_DEFN __declspec(dllimport)
#endif
/* By default, we use the standard "extern" declarations. */