Reverse pcreposix.c #include patch; doesn't work on Windows.

git-svn-id: svn://vcs.exim.org/pcre/code/trunk@536 2f5784b3-3f2a-0410-8824-cb99058d5e15

2 files changed, 17 insertions, 14 deletions

diff --git a/ChangeLog b/ChangeLog
index 302d2c7..899ed84 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -42,36 +42,33 @@ Version 8.10 03-Jun-2010
 11. In UTF-8 mode, if a pattern that was compiled with PCRE_CASELESS was
     studied, and the match started with a letter with a code point greater than
     127 whose first byte was different to the first byte of the other case of
-    the letter, the other case of this starting letter was not recognized.
+    the letter, the other case of this starting letter was not recognized 
+    (#976).
 
-12. pcreposix.c included pcre.h before including pcre_internal.h. This caused a
-    conflict in the definition of PCRE_EXP_DECL. I have removed the include of
-    pcre.h as pcre_internal.h includes pcre.h itself. (This may be a bit of
-    historical tidying that never got done.)
-
-13. If a pattern that was studied started with a repeated Unicode property
+12. If a pattern that was studied started with a repeated Unicode property
     test, for example, \p{Nd}+, there was the theoretical possibility of
     setting up an incorrect bitmap of starting bytes, but fortunately it could
     not have actually happened in practice until change 8 above was made (it
     added property types that matched character-matching opcodes).
 
-14. pcre_study() now recognizes \h, \v, and \R when constructing a bit map of
+13. pcre_study() now recognizes \h, \v, and \R when constructing a bit map of
     possible starting bytes for non-anchored patterns.
 
-15. Extended the "auto-possessify" feature of pcre_compile(). It now recognizes
+14. Extended the "auto-possessify" feature of pcre_compile(). It now recognizes
     \R, and also a number of cases that involve Unicode properties, both
     explicit and implicit when PCRE_UCP is set.
 
-16. If a repeated Unicode property match (e.g. \p{Lu}*) was used with non-UTF-8
+15. If a repeated Unicode property match (e.g. \p{Lu}*) was used with non-UTF-8
     input, it could crash or give wrong results if characters with values
     greater than 0xc0 were present in the subject string. (Detail: it assumed
     UTF-8 input when processing these items.)
 
-17. Added a lot of (int) casts to avoid compiler warnings in systems where
-    size_t is 64-bit.
+16. Added a lot of (int) casts to avoid compiler warnings in systems where
+    size_t is 64-bit (#991).
 
-18. Added a check for running out of memory when PCRE is compiled with
-    --disable-stack-for-recursion.
+17. Added a check for running out of memory when PCRE is compiled with
+    --disable-stack-for-recursion (#990).
+    
 
 
 Version 8.02 19-Mar-2010
diff --git a/pcreposix.c b/pcreposix.c
index d012f0f..090e6c8 100644
--- a/pcreposix.c
+++ b/pcreposix.c
@@ -57,6 +57,12 @@ previously been set. */
 #  define PCREPOSIX_EXP_DEFN __declspec(dllexport)
 #endif
 
+/* We include pcre.h before pcre_internal.h so that the PCRE library functions 
+are declared as "import" for Windows by defining PCRE_EXP_DECL as "import".
+This is needed even though pcre_internal.h itself includes pcre.h, because it 
+does so after it has set PCRE_EXP_DECL to "export" if it is not already set. */
+
+#include "pcre.h"
 #include "pcre_internal.h"
 #include "pcreposix.h"