walkero
/
pcre2
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Modify #ifdefs for Cygwin.

This commit is contained in:
Philip.Hazel 2017-07-27 16:17:19 +00:00
parent 0ba5272960
commit 33a4edf837
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -220,7 +220,8 @@ Unicode Standard Annex #29.
(pcre2_pattern_convert() and friends). (pcre2_pattern_convert() and friends).
51. Change the macro FWRITE, used in pcre2grep, to FWRITE_IGNORE because FWRITE 51. Change the macro FWRITE, used in pcre2grep, to FWRITE_IGNORE because FWRITE
is defined in a system header in cygwin. is defined in a system header in cygwin. Also modified some of the #ifdefs in
pcre2grep related to Windows and Cygwin support.
Version 10.23 14-February-2017 Version 10.23 14-February-2017

8
src/pcre2grep.c
View File

@ -58,7 +58,13 @@ POSSIBILITY OF SUCH DAMAGE.
#include <sys/types.h> #include <sys/types.h>
#include <sys/stat.h> #include <sys/stat.h>
#if (defined _WIN32 || (defined HAVE_WINDOWS_H && HAVE_WINDOWS_H)) && !defined WIN32 #if (defined _WIN32 || (defined HAVE_WINDOWS_H && HAVE_WINDOWS_H)) \
&& !defined WIN32 && !defined(__CYGWIN__)
#define WIN32
#endif
/* Some cmake's define it still */
#if defined(__CYGWIN__) && !defined(WIN32)
#define WIN32 #define WIN32
#endif #endif