diff options
| author | ph10 <ph10@2f5784b3-3f2a-0410-8824-cb99058d5e15> | 2007-09-17 10:09:22 +0000 |
|---|---|---|
| committer | ph10 <ph10@2f5784b3-3f2a-0410-8824-cb99058d5e15> | 2007-09-17 10:09:22 +0000 |
| commit | 9675b21a75d1c07540a2524684ad271106d0024a (patch) | |
| tree | f972e4b33f6467d6ab13075316b90da3743afa9b | |
| parent | 860041b0856fb978874554395e344ee5407d93df (diff) | |
| download | pcre-9675b21a75d1c07540a2524684ad271106d0024a.tar.gz | |
Change condition for the macros for snprintf and strtoll from _WIN32 to
HAVE_WINDOWS_H because they are needed only when windows.h is present.
git-svn-id: svn://vcs.exim.org/pcre/code/trunk@248 2f5784b3-3f2a-0410-8824-cb99058d5e15
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | pcre_scanner_unittest.cc | 2 | ||||
| -rw-r--r-- | pcrecpp.cc | 2 | ||||
| -rw-r--r-- | pcrecpp_unittest.cc | 2 |
4 files changed, 6 insertions, 7 deletions
@@ -32,8 +32,8 @@ Version 7.4 10-Sep-07 compatibility, even though it is no longer used. 7. Added macro for snprintf to pcrecpp_unittest.cc and also for strtoll and - strtoull to pcrecpp.cc to select the available functions in WIN32 (where - different names are used). + strtoull to pcrecpp.cc to select the available functions in WIN32 when the + windows.h file is present (where different names are used). 8. Changed all #include <config.h> to #include "config.h". There were also some further <pcre.h> cases that I changed to "pcre.h". @@ -58,8 +58,7 @@ Version 7.4 10-Sep-07 11. --disable-stack-for-recursion caused compiling to fail unless -enable- unicode-properties was also set. -12. Updated the RunTest script to miss out tests that don't work if \R is - defaulted to ANYCRLF. +12. Updated the tests so that they work when \R is defaulted to ANYCRLF. Version 7.3 28-Aug-07 diff --git a/pcre_scanner_unittest.cc b/pcre_scanner_unittest.cc index 866fac3..c0b8a33 100644 --- a/pcre_scanner_unittest.cc +++ b/pcre_scanner_unittest.cc @@ -44,7 +44,7 @@ #include "pcre_stringpiece.h" #include "pcre_scanner.h" -#ifdef _WIN32 +#ifdef HAVE_WINDOWS_H # define snprintf _snprintf #endif @@ -33,7 +33,7 @@ #include "config.h" #endif -#ifdef _WIN32 +#ifdef HAVE_WINDOWS_H #define HAVE_STRTOQ 1 #define strtoll _strtoui64 #define strtoull _strtoi64 diff --git a/pcrecpp_unittest.cc b/pcrecpp_unittest.cc index 784c3d1..b221539 100644 --- a/pcrecpp_unittest.cc +++ b/pcrecpp_unittest.cc @@ -37,7 +37,7 @@ #include "config.h" #endif -#ifdef _WIN32 +#ifdef HAVE_WINDOWS_H #define snprintf _snprintf #endif |