diff options
| author | Chris Wilson <chris+github@qwirx.com> | 2007-07-26 22:00:00 +0000 |
|---|---|---|
| committer | Chris Wilson <chris+github@qwirx.com> | 2007-07-26 22:00:00 +0000 |
| commit | 243823b91f9bf4eb5f60dbce575904cd20a237ef (patch) | |
| tree | 1456f51a41bdc93ef5e4ffa040e53790adc13bcd /lib/common | |
| parent | 1072b4054a8e01cd848fd0025d766292f174a609 (diff) | |
We now have pcreposix.h instead of regex.h, at least if you follow the
MSVC build instructions. (refs #3, merges [1665])
Diffstat (limited to 'lib/common')
| -rw-r--r-- | lib/common/BoxConfig-MSVC.h | 3 | ||||
| -rw-r--r-- | lib/common/ExcludeList.cpp | 5 |
2 files changed, 6 insertions, 2 deletions
diff --git a/lib/common/BoxConfig-MSVC.h b/lib/common/BoxConfig-MSVC.h index 01fc9c63..0f84f964 100644 --- a/lib/common/BoxConfig-MSVC.h +++ b/lib/common/BoxConfig-MSVC.h @@ -176,7 +176,8 @@ /* #undef HAVE_READLINE_READLINE_H */ /* Define to 1 if you have the <regex.h> header file. */ -#define HAVE_REGEX_H 1 +/* #undef HAVE_REGEX_H */ +#define HAVE_PCREPOSIX_H 1 /* Define to 1 if you have the `setproctitle' function. */ /* #undef HAVE_SETPROCTITLE */ diff --git a/lib/common/ExcludeList.cpp b/lib/common/ExcludeList.cpp index e24246c8..a8d07dcc 100644 --- a/lib/common/ExcludeList.cpp +++ b/lib/common/ExcludeList.cpp @@ -9,7 +9,10 @@ #include "Box.h" -#ifdef HAVE_REGEX_H +#ifdef HAVE_PCREPOSIX_H + #include <pcreposix.h> + #define EXCLUDELIST_IMPLEMENTATION_REGEX_T_DEFINED +#elif defined HAVE_REGEX_H #include <regex.h> #define EXCLUDELIST_IMPLEMENTATION_REGEX_T_DEFINED #endif |