build: FTBFS for pcre2_dftables (#314)

Since fb84d73 (Add compile-time check that PCRE2_CODE_UNIT_WIDTH is
8, 16, or 32, 2023-06-19), building pcre2_dftables had failed.

Add a similar exception to the one what was already in use for
pcre2test and while at it, update the dist file.

Author: carenas

.gitignore

@@ -59,6 +59,8 @@ test-driver
 test-suite.log
 test3input
 test3output
+test3outputA
+test3outputB
 testNinput
 testNinputgrep
 teststderr

src/pcre2_chartables.c.dist

@@ -5,7 +5,8 @@
 /* This file was automatically written by the pcre2_dftables auxiliary
 program. It contains character tables that are used when no external
 tables are passed to PCRE2 by the application that calls it. The tables
-are used only for characters whose code values are less than 256. */
+are used only for characters whose code values are less than 256, and
+only relevant if not in UCP mode. */
 
 /* This set of tables was written in the C locale. */
 
@@ -18,13 +19,6 @@ PCRE2 is configured with --enable-rebuild-chartables. However, you can run
 pcre2_dftables manually with the -L option to build tables using the LC_ALL
 locale. */
 
-/* The following #include is present because without it gcc 4.x may remove
-the array definition from the final binary if PCRE2 is built into a static
-library and dead code stripping is activated. This leads to link errors.
-Pulling in the header ensures that the array gets flagged as "someone
-outside this compilation unit might reference this" and so it will always
-be supplied to the linker. */
-
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
@@ -163,7 +157,7 @@ graph, print, punct, and cntrl. Other classes are built from combinations. */
   0x02   letter
   0x04   lower case letter
   0x08   decimal digit
-  0x10   alphanumeric or '_'
+  0x10   word (alphanumeric or '_')
 */
 
   0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /*   0-  7 */

src/pcre2_dftables.c

@@ -56,10 +56,11 @@ given, they are written in binary. */
 #include <string.h>
 #include <locale.h>
 
+#define PCRE2_DFTABLES            /* for pcre2_internal.h, pcre2_maketables.c */
+
 #define PCRE2_CODE_UNIT_WIDTH 0   /* Must be set, but not relevant here */
 #include "pcre2_internal.h"
 
-#define PCRE2_DFTABLES            /* pcre2_maketables.c notices this */
 #include "pcre2_maketables.c"
 
 
@@ -98,8 +99,8 @@ int i;
 int nclass = 0;
 BOOL binary = FALSE;
 char *env = (char *)"C";
-const unsigned char *tables;
-const unsigned char *base_of_tables;
+const uint8_t *tables;
+const uint8_t *base_of_tables;
 
 /* Process options */
 
@@ -180,7 +181,8 @@ the very long string otherwise. */
   "/* This file was automatically written by the pcre2_dftables auxiliary\n"
   "program. It contains character tables that are used when no external\n"
   "tables are passed to PCRE2 by the application that calls it. The tables\n"
-  "are used only for characters whose code values are less than 256. */\n\n");
+  "are used only for characters whose code values are less than 256, and\n"
+  "only relevant if not in UCP mode. */\n\n");
 
 (void)fprintf(f,
   "/* This set of tables was written in the %s locale. */\n\n", env);
@@ -205,14 +207,6 @@ the very long string otherwise. */
   "#endif\n\n");
 #endif
 
-(void)fprintf(f,
-  "/* The following #include is present because without it gcc 4.x may remove\n"
-  "the array definition from the final binary if PCRE2 is built into a static\n"
-  "library and dead code stripping is activated. This leads to link errors.\n"
-  "Pulling in the header ensures that the array gets flagged as \"someone\n"
-  "outside this compilation unit might reference this\" and so it will always\n"
-  "be supplied to the linker. */\n\n");
-
 (void)fprintf(f,
   "#ifdef HAVE_CONFIG_H\n"
   "#include \"config.h\"\n"
@@ -269,7 +263,7 @@ for (i = 0; i < cbit_length; i++)
   "  0x%02x   letter\n"
   "  0x%02x   lower case letter\n"
   "  0x%02x   decimal digit\n"
-  "  0x%02x   alphanumeric or '_'\n*/\n\n",
+  "  0x%02x   word (alphanumeric or '_')\n*/\n\n",
   ctype_space, ctype_letter, ctype_lcletter, ctype_digit, ctype_word);
 
 (void)fprintf(f, "  ");

src/pcre2_internal.h

@@ -59,7 +59,7 @@ be including this file. There is no explicit way of forcing a compile to be
 abandoned, but trying to include a non-existent file seems cleanest. Otherwise
 there will be many irrelevant consequential errors. */
 
-#if !defined PCRE2_BUILDING_PCRE2TEST && \
+#if (!defined PCRE2_BUILDING_PCRE2TEST && !defined PCRE2_DFTABLES) && \
   (!defined PCRE2_CODE_UNIT_WIDTH ||     \
     (PCRE2_CODE_UNIT_WIDTH != 8 &&       \
      PCRE2_CODE_UNIT_WIDTH != 16 &&      \