aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/common/unicode/Makefile4
-rw-r--r--src/common/unicode/generate-unicode_combining_table.pl (renamed from src/common/unicode/generate-unicode_width_table.pl)2
-rw-r--r--src/common/wchar.c2
-rw-r--r--src/include/common/unicode_combining_table.h (renamed from src/include/common/unicode_width_table.h)2
4 files changed, 5 insertions, 5 deletions
diff --git a/src/common/unicode/Makefile b/src/common/unicode/Makefile
index 499e31d59f0..eb14add28ad 100644
--- a/src/common/unicode/Makefile
+++ b/src/common/unicode/Makefile
@@ -18,7 +18,7 @@ LIBS += $(PTHREAD_LIBS)
# By default, do nothing.
all:
-update-unicode: unicode_norm_table.h unicode_width_table.h unicode_normprops_table.h unicode_norm_hashfunc.h
+update-unicode: unicode_norm_table.h unicode_combining_table.h unicode_normprops_table.h unicode_norm_hashfunc.h
mv $^ ../../../src/include/common/
$(MAKE) normalization-check
@@ -35,7 +35,7 @@ unicode_norm_hashfunc.h: unicode_norm_table.h
unicode_norm_table.h: generate-unicode_norm_table.pl UnicodeData.txt CompositionExclusions.txt
$(PERL) generate-unicode_norm_table.pl
-unicode_width_table.h: generate-unicode_width_table.pl UnicodeData.txt
+unicode_combining_table.h: generate-unicode_combining_table.pl UnicodeData.txt
$(PERL) $^ >$@
unicode_normprops_table.h: generate-unicode_normprops_table.pl DerivedNormalizationProps.txt
diff --git a/src/common/unicode/generate-unicode_width_table.pl b/src/common/unicode/generate-unicode_combining_table.pl
index 90b57af075e..86aed789070 100644
--- a/src/common/unicode/generate-unicode_width_table.pl
+++ b/src/common/unicode/generate-unicode_combining_table.pl
@@ -15,7 +15,7 @@ my $prev_codepoint;
my $count = 0;
print
- "/* generated by src/common/unicode/generate-unicode_width_table.pl, do not edit */\n\n";
+ "/* generated by src/common/unicode/generate-unicode_combining_table.pl, do not edit */\n\n";
print "static const struct mbinterval combining[] = {\n";
diff --git a/src/common/wchar.c b/src/common/wchar.c
index bb97b5f54f4..0636b8765ba 100644
--- a/src/common/wchar.c
+++ b/src/common/wchar.c
@@ -644,7 +644,7 @@ mbbisearch(pg_wchar ucs, const struct mbinterval *table, int max)
static int
ucs_wcwidth(pg_wchar ucs)
{
-#include "common/unicode_width_table.h"
+#include "common/unicode_combining_table.h"
/* test for 8-bit control characters */
if (ucs == 0)
diff --git a/src/include/common/unicode_width_table.h b/src/include/common/unicode_combining_table.h
index 3a02ed5c626..a9f10c31bc8 100644
--- a/src/include/common/unicode_width_table.h
+++ b/src/include/common/unicode_combining_table.h
@@ -1,4 +1,4 @@
-/* generated by src/common/unicode/generate-unicode_width_table.pl, do not edit */
+/* generated by src/common/unicode/generate-unicode_combining_table.pl, do not edit */
static const struct mbinterval combining[] = {
{0x0300, 0x036F},