Mercurial > octave-nkf

diff src/DLD-FUNCTIONS/regexp.cc @ 7117:373c39904877

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[project @ 2007-11-07 18:48:00 by jwe]
author jwe
date Wed, 07 Nov 2007 18:48:01 +0000
parents a1dbe9d80eee
children ff2ff2c09865
line wrap: on
line diff
--- a/src/DLD-FUNCTIONS/regexp.cc	Wed Nov 07 15:49:37 2007 +0000
+++ b/src/DLD-FUNCTIONS/regexp.cc	Wed Nov 07 18:48:01 2007 +0000
@@ -40,16 +40,16 @@
 #include "quit.h"
 #include "parse.h"
 
-#ifdef HAVE_PCRE
+#if defined (HAVE_PCRE_PCRE_H)
+#include <pcre/pcre.h>
+#elif defined (HAVE_PCRE_H)
 #include <pcre.h>
-#else
-#ifdef HAVE_REGEX
-#ifdef __MINGW32__
+#elif defined (HAVE_REGEX)
+#if defined (__MINGW32__)
 #define __restrict
 #endif
 #include <regex.h>
 #endif
-#endif
 
 // The regexp is constructed as a linked list to avoid resizing the
 // return values in arrays at each new match.