Permalink
Browse files

we are always static with pcre

  • Loading branch information...
1 parent 25bb636 commit 77e5ed58d6967ca0f91299a58dafa10bf185f067 @dwight dwight committed Nov 30, 2009
Showing with 11 additions and 11 deletions.
  1. +2 −2 pcre-7.4/pcre.h
  2. +3 −3 pcre-7.4/pcre_internal.h
  3. +1 −1 pcre-7.4/pcre_scanner.h
  4. +1 −1 pcre-7.4/pcre_version.c
  5. +2 −2 pcre-7.4/pcrecpp.h
  6. +2 −2 pcre-7.4/pcreposix.c
View
@@ -51,7 +51,7 @@ imported have to be identified as such. When building PCRE, the appropriate
export setting is defined in pcre_internal.h, which includes this file. So we
don't change existing definitions of PCRE_EXP_DECL and PCRECPP_EXP_DECL. */
-#if defined(_WIN32) && !defined(PCRE_STATIC)
+/*#if defined(_WIN32) && !defined(PCRE_STATIC)
#error why are we here?
# ifndef PCRE_EXP_DECL
# define PCRE_EXP_DECL extern __declspec(dllimport)
@@ -64,7 +64,7 @@ don't change existing definitions of PCRE_EXP_DECL and PCRECPP_EXP_DECL. */
# define PCRECPP_EXP_DEFN __declspec(dllimport)
# endif
# endif
-#endif
+#endif*/
/* By default, we use the standard "extern" declarations. */
View
@@ -107,7 +107,7 @@ exported symbols. That's why, in the non-Windows case, we set PCRE_EXP_DEFN and
PCRE_EXP_DATA_DEFN only if they are not already set. */
#ifndef PCRE_EXP_DECL
-# ifdef _WIN32
+/*# ifdef _WIN32
# ifndef PCRE_STATIC
# define PCRE_EXP_DECL extern __declspec(dllexport)
# define PCRE_EXP_DEFN __declspec(dllexport)
@@ -117,7 +117,7 @@ PCRE_EXP_DATA_DEFN only if they are not already set. */
# define PCRE_EXP_DEFN
# define PCRE_EXP_DATA_DEFN
# endif
-# else
+# else*/
# ifdef __cplusplus
# define PCRE_EXP_DECL extern "C"
# else
@@ -130,7 +130,7 @@ PCRE_EXP_DATA_DEFN only if they are not already set. */
# define PCRE_EXP_DATA_DEFN
# endif
# endif
-#endif
+/*#endif*/
/* We need to have types that specify unsigned 16-bit and 32-bit integers. We
cannot determine these outside the compilation (e.g. by running a program as
View
@@ -53,7 +53,7 @@
namespace pcrecpp {
-class PCRECPP_EXP_DEFN Scanner {
+class Scanner {
public:
Scanner();
explicit Scanner(const std::string& input);
View
@@ -79,7 +79,7 @@ I could find no way of detecting that a macro is defined as an empty string at
pre-processor time. This hack uses a standard trick for avoiding calling
the STRING macro with an empty argument when doing the test. */
-PCRE_EXP_DEFN const char *
+const char *
pcre_version(void)
{
return (XSTRING(Z PCRE_PRERELEASE)[1] == 0)?
View
@@ -355,7 +355,7 @@ PCRECPP_EXP_DECL 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 PCRECPP_EXP_DEFN RE_Options {
+class RE_Options {
public:
// constructor
RE_Options() : match_limit_(0), match_limit_recursion_(0), all_options_(0) {}
@@ -487,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 PCRECPP_EXP_DEFN RE {
+class 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.
View
@@ -52,12 +52,12 @@ compiling these functions. This must come before including pcreposix.h, where
they are set for an application (using these functions) if they have not
previously been set. */
-#if defined(_WIN32) && !defined(PCRE_STATIC)
+/*#if defined(_WIN32) && !defined(PCRE_STATIC)
#error why are we here?
# define PCREPOSIX_EXP_DECL extern __declspec(dllexport)
# define PCREPOSIX_EXP_DEFN __declspec(dllexport)
#endif
-
+*/
#include "pcre.h"
#include "pcre_internal.h"
#include "pcreposix.h"

0 comments on commit 77e5ed5

Please sign in to comment.