diff --git a/uppsrc/plugin/pcre/lib.cpp b/uppsrc/plugin/pcre/lib.c similarity index 81% rename from uppsrc/plugin/pcre/lib.cpp rename to uppsrc/plugin/pcre/lib.c index 0ecaa6127..8e57d9390 100644 --- a/uppsrc/plugin/pcre/lib.cpp +++ b/uppsrc/plugin/pcre/lib.c @@ -1,7 +1,3 @@ -#include - -using namespace Upp; - #define SUPPORT_UTF #define SUPPORT_UTF8 //is needed anymore? #define SUPPORT_UCP @@ -11,13 +7,23 @@ using namespace Upp; ////#define HAVE_INTTYPES_H 0 //#undef HAVE_STDINT_H //#undef HAVE_INTTYPES_H -#define int64_t int64 +#ifdef _MSC_VER + +typedef __int64 int64; +typedef unsigned __int64 uint64; + +#else + +typedef long long int int64; +typedef long long unsigned uint64; -#ifdef COMPILER_GCC #define PCRE_STATIC + #endif +#define int64_t int64 + #include "lib/pcre_byte_order.c" #include "lib/pcre_chartables.c" #include "lib/pcre_compile.c" diff --git a/uppsrc/plugin/pcre/pcre.upp b/uppsrc/plugin/pcre/pcre.upp index 1c218dce0..9806614fa 100644 --- a/uppsrc/plugin/pcre/pcre.upp +++ b/uppsrc/plugin/pcre/pcre.upp @@ -12,6 +12,6 @@ file RegExp.h, RegExp.cpp, lib/config.h, - lib.cpp, + lib.c, Copying;