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

Timestamp:

Nov 11, 2007, 11:24:37 AM (18 years ago)

Author:

Darin Adler

Message:

• try another way of fixing dftables builds -- refactor pcre_internal.h a bit

• pcre/pcre_internal.h: Make most of this header do nothing when DFTABLES is set. Later we can break it into two files.

• JavaScriptCore.vcproj/dftables/dftables.vcproj: Take out now-unneeded include paths.
• pcre/dftables.cpp: Set DFTABLES. Use delete instead of free.
• pcre/dftables.pro: Take out now-unneeded include paths.
• pcre/pcre_maketables.cpp: Use new instead of malloc.

File:

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

trunk/JavaScriptCore/pcre/pcre_internal.h

@@ -44 +44 @@
 #ifndef PCRE_INTERNAL_H
 #define PCRE_INTERNAL_H
+
+#ifndef DFTABLES
 
 #include "Assertions.h"
@@ -538 +540 @@
 } compile_data;
 
+/* Layout of the UCP type table that translates property names into types and
+codes. */
+
+typedef struct {
+  const char *name;
+  pcre_uint16 type;
+  pcre_uint16 value;
+} ucp_type_table;
+
+
+/* Internal shared data tables. These are tables that are used by more than one
+of the exported public functions. They have to be "external" in the C sense,
+but are not part of the PCRE public API. The data for these tables is in the
+pcre_tables.c module. */
+
+extern const int    _pcre_utf8_table1[];
+extern const int    _pcre_utf8_table2[];
+extern const int    _pcre_utf8_table3[];
+extern const uschar _pcre_utf8_table4[];
+
+extern const int    _pcre_utf8_table1_size;
+
+extern const uschar _pcre_default_tables[];
+
+
+/* Internal shared functions. These are functions that are used by more than
+one of the exported public functions. They have to be "external" in the C
+sense, but are not part of the PCRE public API. */
+
+extern int         _pcre_ord2utf8(int, uschar *);
+extern int         _pcre_ucp_othercase(const int);
+extern BOOL        _pcre_xclass(int, const uschar *);
+
+#define IS_NEWLINE(nl) ((nl) == 0xA || (nl) == 0xD || (nl) == 0x2028 || (nl) == 0x2029)
+
+#endif
+
 /* Bit definitions for entries in the pcre_ctypes table. */
 
@@ -561 +600 @@
 #define tables_length (ctypes_offset + 128)
 
-/* Layout of the UCP type table that translates property names into types and
-codes. */
-
-typedef struct {
-  const char *name;
-  pcre_uint16 type;
-  pcre_uint16 value;
-} ucp_type_table;
-
-
-/* Internal shared data tables. These are tables that are used by more than one
-of the exported public functions. They have to be "external" in the C sense,
-but are not part of the PCRE public API. The data for these tables is in the
-pcre_tables.c module. */
-
-extern const int    _pcre_utf8_table1[];
-extern const int    _pcre_utf8_table2[];
-extern const int    _pcre_utf8_table3[];
-extern const uschar _pcre_utf8_table4[];
-
-extern const int    _pcre_utf8_table1_size;
-
-extern const uschar _pcre_default_tables[];
-
-
-/* Internal shared functions. These are functions that are used by more than
-one of the exported public functions. They have to be "external" in the C
-sense, but are not part of the PCRE public API. */
-
-extern int         _pcre_ord2utf8(int, uschar *);
-extern int         _pcre_ucp_othercase(const int);
-extern BOOL        _pcre_xclass(int, const uschar *);
-
-#define IS_NEWLINE(nl) ((nl) == 0xA || (nl) == 0xD || (nl) == 0x2028 || (nl) == 0x2029)
-
 #endif