|
|
Index: src/Makefile.in |
|
|
--- src/Makefile.in.orig 2019-03-19 09:58:04.000000000 +0100 |
|
|
+++ src/Makefile.in 2019-12-26 11:29:12.798381000 +0100 |
|
|
@@ -1615,7 +1615,7 @@ |
|
|
|
|
|
errnos-sym.h: Makefile mkstrtable.awk errnos.in |
|
|
$(AWK) -f $(srcdir)/mkstrtable.awk -v textidx=2 -v nogettext=1 \ |
|
|
- -v prefix=GPG_ERR_ -v namespace=errnos_ \ |
|
|
+ -v prefix=GPG_ERR_ -v namespacex=errnos_ \ |
|
|
$(srcdir)/errnos.in >$@ |
|
|
|
|
|
mkheader$(EXEEXT_FOR_BUILD): mkheader.c Makefile |
|
|
Index: src/gpg-error.c |
|
|
--- src/gpg-error.c.orig 2019-01-16 08:43:46.000000000 +0100 |
|
|
+++ src/gpg-error.c 2019-12-26 11:28:12.021064000 +0100 |
|
|
@@ -86,11 +86,15 @@ |
|
|
locale_dir = get_locale_dir (); |
|
|
if (locale_dir) |
|
|
{ |
|
|
+#ifdef ENABLE_NLS |
|
|
bindtextdomain (PACKAGE, locale_dir); |
|
|
+#endif |
|
|
drop_locale_dir (locale_dir); |
|
|
} |
|
|
+#ifdef ENABLE_NLS |
|
|
textdomain (PACKAGE); |
|
|
#endif |
|
|
+#endif |
|
|
} |
|
|
|
|
|
|
|
|
Index: src/mkerrcodes.awk |
|
|
--- src/mkerrcodes.awk.orig 2013-03-15 20:24:25.000000000 +0100 |
|
|
+++ src/mkerrcodes.awk 2019-12-26 11:28:12.021201000 +0100 |
|
|
@@ -85,7 +85,7 @@ |
|
|
} |
|
|
|
|
|
!header { |
|
|
- sub (/\#.+/, ""); |
|
|
+ sub (/#.+/, ""); |
|
|
sub (/[ ]+$/, ""); # Strip trailing space and tab characters. |
|
|
|
|
|
if (/^$/) |
|
|
Index: src/mkerrcodes1.awk |
|
|
--- src/mkerrcodes1.awk.orig 2013-03-15 20:24:25.000000000 +0100 |
|
|
+++ src/mkerrcodes1.awk 2019-12-26 11:28:12.021319000 +0100 |
|
|
@@ -81,7 +81,7 @@ |
|
|
} |
|
|
|
|
|
!header { |
|
|
- sub (/\#.+/, ""); |
|
|
+ sub (/#.+/, ""); |
|
|
sub (/[ ]+$/, ""); # Strip trailing space and tab characters. |
|
|
|
|
|
if (/^$/) |
|
|
Index: src/mkerrcodes2.awk |
|
|
--- src/mkerrcodes2.awk.orig 2013-03-15 20:24:25.000000000 +0100 |
|
|
+++ src/mkerrcodes2.awk 2019-12-26 11:28:12.021439000 +0100 |
|
|
@@ -91,7 +91,7 @@ |
|
|
} |
|
|
|
|
|
!header { |
|
|
- sub (/\#.+/, ""); |
|
|
+ sub (/#.+/, ""); |
|
|
sub (/[ ]+$/, ""); # Strip trailing space and tab characters. |
|
|
|
|
|
if (/^$/) |
|
|
Index: src/mkerrnos.awk |
|
|
--- src/mkerrnos.awk.orig 2013-03-15 20:24:25.000000000 +0100 |
|
|
+++ src/mkerrnos.awk 2019-12-26 11:28:12.021546000 +0100 |
|
|
@@ -83,7 +83,7 @@ |
|
|
} |
|
|
|
|
|
!header { |
|
|
- sub (/\#.+/, ""); |
|
|
+ sub (/#.+/, ""); |
|
|
sub (/[ ]+$/, ""); # Strip trailing space and tab characters. |
|
|
|
|
|
if (/^$/) |
|
|
Index: src/mkstrtable.awk |
|
|
--- src/mkstrtable.awk.orig 2013-03-15 20:24:25.000000000 +0100 |
|
|
+++ src/mkstrtable.awk 2019-12-26 11:29:05.879779000 +0100 |
|
|
@@ -102,7 +102,7 @@ |
|
|
print "/* The purpose of this complex string table is to produce"; |
|
|
print " optimal code with a minimum of relocations. */"; |
|
|
print ""; |
|
|
- print "static const char " namespace "msgstr[] = "; |
|
|
+ print "static const char " namespacex "msgstr[] = "; |
|
|
header = 0; |
|
|
} |
|
|
else |
|
|
@@ -110,7 +110,7 @@ |
|
|
} |
|
|
|
|
|
!header { |
|
|
- sub (/\#.+/, ""); |
|
|
+ sub (/#.+/, ""); |
|
|
sub (/[ ]+$/, ""); # Strip trailing space and tab characters. |
|
|
|
|
|
if (/^$/) |
|
|
@@ -150,7 +150,7 @@ |
|
|
else |
|
|
print " gettext_noop (\"" last_msgstr "\");"; |
|
|
print ""; |
|
|
- print "static const int " namespace "msgidx[] ="; |
|
|
+ print "static const int " namespacex "msgidx[] ="; |
|
|
print " {"; |
|
|
for (i = 0; i < coded_msgs; i++) |
|
|
print " " pos[i] ","; |
|
|
@@ -158,7 +158,7 @@ |
|
|
print " };"; |
|
|
print ""; |
|
|
print "static GPG_ERR_INLINE int"; |
|
|
- print namespace "msgidxof (int code)"; |
|
|
+ print namespacex "msgidxof (int code)"; |
|
|
print "{"; |
|
|
print " return (0 ? 0"; |
|
|
|
|
|
|
