Changeset 18498 in webkit for trunk/JavaScriptCore/pcre/pcre_internal.h

Timestamp:

Dec 31, 2006, 9:07:40 PM (18 years ago)

Author:

ddkilzer

Message:

JavaScriptCore:

Reviewed by Geoff.

Update embedded pcre library from version 6.2 to 6.4. Changes from pcre 6.2 to 6.3
did not include any files in JavaScriptCore/pcre.

All changes include renaming EXPORT to PCRE_EXPORT, renaming of ucp_findchar() to
_pcre_ucp_findchar(), or comment changes. Additional changes noted below.

• JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.vcproj: Updated source file list.
• JavaScriptCore.xcodeproj/project.pbxproj: Renamed pcre_printint.c to pcre_printint.src and changed it from a source file to a header file.
• JavaScriptCoreSources.bkl: Updated source file list.
• pcre/CMakeLists.txt: Updated source file list.
• pcre/pcre-config.h:
• pcre/pcre.h: Updated version.
• pcre/pcre.pri: Updated source file list.
• pcre/pcre_compile.c: Include pcre_printint.src #if DEBUG. (pcre_compile2):
• pcre/pcre_config.c:
• pcre/pcre_exec.c: (match):
• pcre/pcre_fullinfo.c:
• pcre/pcre_info.c:
• pcre/pcre_internal.h: Added header guard. Removed export of _pcre_printint().
• pcre/pcre_ord2utf8.c:
• pcre/pcre_printint.c: Renamed to pcre_printint.src.
• pcre/pcre_printint.src: Added. Renamed _pcre_printint() to pcre_printint().
• pcre/pcre_refcount.c:
• pcre/pcre_study.c:
• pcre/pcre_tables.c:
• pcre/pcre_try_flipped.c:
• pcre/pcre_ucp_findchar.c: Added contents of ucp_findchar.c.
• pcre/pcre_version.c:
• pcre/pcre_xclass.c: (_pcre_xclass):
• pcre/ucp.h: Removed export of ucp_findchar().
• pcre/ucp_findchar.c: Removed. Contents moved to pcre_ucp_findchar.c.

File:

• trunk/JavaScriptCore/pcre/pcre_internal.h (modified) (8 diffs)

trunk/JavaScriptCore/pcre/pcre_internal.h

@@ -40 +40 @@
 */
 
+/* This header contains definitions that are shared between the different
+modules, but which are not relevant to the exported API. This includes some
+functions whose names all begin with "_pcre_". */
+
+#ifndef PCRE_INTERNAL_H
+#define PCRE_INTERNAL_H
+
 #include "Assertions.h"
 
@@ -54 +61 @@
 #pragma warning(disable: 4244)
 #endif
-
-/* This header contains definitions that are shared between the different
-modules, but which are not relevant to the exported API. This includes some
-functions whose names all begin with "_pcre_". */
 
 #define _pcre_OP_lengths kjs_pcre_OP_lengths
@@ -77 +80 @@
 /* Define DEBUG to get debugging output on stdout. */
 
-/****
+#if 0
 #define DEBUG
-****/
+#endif
 
 /* Use a macro for debugging printing, 'cause that eliminates the use of #ifdef
@@ -135 +138 @@
 #endif
 
-/* Include the public PCRE header */
+/* Include the public PCRE header and the definitions of UCP character property
+values. */
 
 #include "pcre.h"
+#include "ucp.h"
 
 /* All character handling must be done as unsigned characters. Otherwise there
@@ -154 +159 @@
 typedef unsigned char pcre_uchar;
 #endif
-
-/* Include the (copy of) the public ucp header, changing the external name into
-a private one. This does no harm, even if we aren't compiling UCP support. */
-
-#define ucp_findchar _pcre_ucp_findchar
-#include "ucp.h"
 
 /* When compiling for use with the Virtual Pascal compiler, these functions
@@ -952 +951 @@
 
 /* Layout of the UCP type table that translates property names into codes for
-ucp_findchar(). */
+_pcre_ucp_findchar(). */
 
 typedef struct {
@@ -984 +983 @@
 
 extern int         _pcre_ord2utf8(int, uschar *);
-extern void        _pcre_printint(pcre *, FILE *);
 extern real_pcre * _pcre_try_flipped(const real_pcre *, real_pcre *,
                      const pcre_study_data *, pcre_study_data *);
@@ -991 +989 @@
 extern BOOL        _pcre_xclass(int, const uschar *);
 
+#endif
+
 /* End of pcre_internal.h */