Fix the build on Win32 by syncing up the .hw headers

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94058 13f79535-47bb-0310-9956-ffa450edef68

2 files changed, 33 insertions, 9 deletions

diff --git a/srclib/pcre/config.hw b/srclib/pcre/config.hw
index 124f5de2ce..e192e8bc6e 100644
--- a/srclib/pcre/config.hw
+++ b/srclib/pcre/config.hw
@@ -3,9 +3,13 @@
 written in Standard C, but there are a few non-standard things it can cope
 with, allowing it to run on SunOS4 and other "close to standard" systems.
 
-On a non-Unix system you should just copy this file into config.h and change
-the definitions of HAVE_STRERROR and HAVE_MEMMOVE to 1. Unfortunately, because
-of the way autoconf works, these cannot be made the defaults. */
+On a non-Unix system you should just copy this file into config.h, and set up
+the macros the way you need them. You should normally change the definitions of
+HAVE_STRERROR and HAVE_MEMMOVE to 1. Unfortunately, because of the way autoconf
+works, these cannot be made the defaults. If your system has bcopy() and not
+memmove(), change the definition of HAVE_BCOPY instead of HAVE_MEMMOVE. If your
+system has neither bcopy() nor memmove(), leave them both as 0; an emulation
+function will be used. */
 
 /* Define to empty if the keyword does not work. */
 
@@ -25,4 +29,18 @@ change 1 to 0 if the functions are not found. */
 #define HAVE_STRERROR 1
 #define HAVE_MEMMOVE  1
 
+/* There are some non-Unix systems that don't even have bcopy(). If this macro
+is false, an emulation is used. If HAVE_MEMMOVE is set to 1, the value of
+HAVE_BCOPY is not relevant. */
+
+#define HAVE_BCOPY 0
+
+/* The value of NEWLINE determines the newline character. The default is to
+leave it up to the compiler, but some sites want to force a particular value.
+On Unix systems, "configure" can be used to override this default. */
+
+#ifndef NEWLINE
+#define NEWLINE '\n'
+#endif
+
 /* End */
diff --git a/srclib/pcre/pcre.hw b/srclib/pcre/pcre.hw
index eb6d3bbbed..40d819818e 100644
--- a/srclib/pcre/pcre.hw
+++ b/srclib/pcre/pcre.hw
@@ -2,7 +2,7 @@
 *       Perl-Compatible Regular Expressions      *
 *************************************************/
 
-/* Copyright (c) 1997-2000 University of Cambridge */
+/* Copyright (c) 1997-2001 University of Cambridge */
 
 #ifndef _PCRE_H
 #define _PCRE_H
@@ -11,8 +11,8 @@
 Do not edit it; instead make changes to pcre.in and/or pcre.hw */
 
 #define PCRE_MAJOR 3
-#define PCRE_MINOR 2
-#define PCRE_DATE  12-May-2000
+#define PCRE_MINOR          9
+#define PCRE_DATE           02-Jan-2002
 
 /* Win32 uses DLL by default */
 
@@ -50,6 +50,7 @@ extern "C" {
 #define PCRE_NOTEOL          0x0100
 #define PCRE_UNGREEDY        0x0200
 #define PCRE_NOTEMPTY        0x0400
+#define PCRE_UTF8            0x0800
 
 /* Exec-time and get-time error codes */
 
@@ -73,8 +74,11 @@ extern "C" {
 
 /* Types */
 
-typedef void pcre;
-typedef void pcre_extra;
+struct real_pcre;        /* declaration; the definition is private  */
+struct real_pcre_extra;  /* declaration; the definition is private */
+
+typedef struct real_pcre pcre;
+typedef struct real_pcre_extra pcre_extra;
 
 /* Store get and free functions. These can be set to alternative malloc/free
 functions if required. Some magic is required for Win32 DLL; it is null on
@@ -92,11 +96,13 @@ extern pcre *pcre_compile(const char *, int, const char **, int *,
 extern int pcre_copy_substring(const char *, int *, int, int, char *, int);
 extern int pcre_exec(const pcre *, const pcre_extra *, const char *,
   int, int, int, int *, int);
+extern void pcre_free_substring(const char *);
+extern void pcre_free_substring_list(const char **);
 extern int pcre_get_substring(const char *, int *, int, int, const char **);
 extern int pcre_get_substring_list(const char *, int *, int, const char ***);
 extern int pcre_info(const pcre *, int *, int *);
 extern int pcre_fullinfo(const pcre *, const pcre_extra *, int, void *);
-extern unsigned const char *pcre_maketables(void);
+extern const unsigned char *pcre_maketables(void);
 extern pcre_extra *pcre_study(const pcre *, int, const char **);
 extern const char *pcre_version(void);