[Box Backup-commit] COMMIT r1759 - box/chris/merge/lib/common

[boxbackup-dev@fluffy.co.uk]

Author: chris
Date: 2007-07-26 23:00:00 +0100 (Thu, 26 Jul 2007)
New Revision: 1759

Modified:
   box/chris/merge/lib/common/BoxConfig-MSVC.h
   box/chris/merge/lib/common/ExcludeList.cpp
Log:
We now have pcreposix.h instead of regex.h, at least if you follow the
MSVC build instructions. (refs #3, merges [1665])


Modified: box/chris/merge/lib/common/BoxConfig-MSVC.h
===================================================================
--- box/chris/merge/lib/common/BoxConfig-MSVC.h	2007-07-26 21:59:36 UTC (rev 1758)
+++ box/chris/merge/lib/common/BoxConfig-MSVC.h	2007-07-26 22:00:00 UTC (rev 1759)
@@ -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 */

Modified: box/chris/merge/lib/common/ExcludeList.cpp
===================================================================
--- box/chris/merge/lib/common/ExcludeList.cpp	2007-07-26 21:59:36 UTC (rev 1758)
+++ box/chris/merge/lib/common/ExcludeList.cpp	2007-07-26 22:00:00 UTC (rev 1759)
@@ -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