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

1 files changed, 6 insertions, 7 deletions

diff --git a/pcrecpp.h b/pcrecpp.h
index e3f1b71..cb30552 100644
--- a/pcrecpp.h
+++ b/pcrecpp.h
@@ -331,11 +331,10 @@
 
 
 #include <string>
-#include <pcrecpparg.h>   // defines the Arg class
-// These aren't technically needed here, but we include them
-// anyway so folks who include pcrecpp.h don't have to include
-// all these other header files as well.
 #include <pcre.h>
+#include <pcrecpparg.h>   // defines the Arg class
+// This isn't technically needed here, but we include it
+// anyway so folks who include pcrecpp.h don't have to.
 #include <pcre_stringpiece.h>
 
 namespace pcrecpp {
@@ -348,7 +347,7 @@ namespace pcrecpp {
         (all_options_ & o) == o
 
 // We convert user-passed pointers into special Arg objects
-extern Arg no_arg;
+PCRECPP_EXP_DECL Arg no_arg;
 
 /***** Compiling regular expressions: the RE class *****/
 
@@ -356,7 +355,7 @@ extern Arg no_arg;
 // along with other options we put on top of pcre.
 // Only 9 modifiers, plus match_limit and match_limit_recursion,
 // are supported now.
-class RE_Options {
+class PCRECPP_EXP_DECL RE_Options {
  public:
   // constructor
   RE_Options() : match_limit_(0), match_limit_recursion_(0), all_options_(0) {}
@@ -488,7 +487,7 @@ static inline RE_Options EXTENDED() {
 // Interface for regular expression matching.  Also corresponds to a
 // pre-compiled regular expression.  An "RE" object is safe for
 // concurrent use by multiple threads.
-class RE {
+class PCRECPP_EXP_DECL RE {
  public:
   // We provide implicit conversions from strings so that users can
   // pass in a string or a "const char*" wherever an "RE" is expected.