1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
|
--- libprelude-5.1.1/src/libprelude-error/Makefile.am 2018-12-23 21:59:17.340000000 +0100
+++ libprelude-5.1.1/src/libprelude-error/Makefile.am 2019-07-11 17:33:18.537430699 +0200
@@ -53,7 +53,7 @@
errnos-sym.h: Makefile mkstrtable.awk errnos.in
LANG="" $(AWK) -f $(srcdir)/mkstrtable.awk -v textidx=2 -v nogettext=1 \
- -v prefix=PRELUDE_ERROR_ -v namespace=errnos_ \
+ -v prefix=PRELUDE_ERROR_ -v pkg_namespace=errnos_ \
$(srcdir)/errnos.in >$@
prelude-error.h: Makefile mkheader.awk err-sources.h.in err-codes.h.in errnos.in prelude-error.h.in
--- libprelude-5.1.1/src/libprelude-error/Makefile.in 2018-12-23 22:01:05.090000000 +0100
+++ libprelude-5.1.1/src/libprelude-error/Makefile.in 2019-07-11 17:33:10.202599542 +0200
@@ -1834,7 +1834,7 @@
errnos-sym.h: Makefile mkstrtable.awk errnos.in
LANG="" $(AWK) -f $(srcdir)/mkstrtable.awk -v textidx=2 -v nogettext=1 \
- -v prefix=PRELUDE_ERROR_ -v namespace=errnos_ \
+ -v prefix=PRELUDE_ERROR_ -v pkg_namespace=errnos_ \
$(srcdir)/errnos.in >$@
prelude-error.h: Makefile mkheader.awk err-sources.h.in err-codes.h.in errnos.in prelude-error.h.in
--- libprelude-5.1.1/src/libprelude-error/mkerrcodes.awk 2018-12-23 21:59:17.340000000 +0100
+++ libprelude-5.1.1/src/libprelude-error/mkerrcodes.awk 2019-07-11 17:34:56.482462208 +0200
@@ -78,7 +78,7 @@
}
!header {
- sub (/\#.+/, "");
+ sub (/#.+/, "");
sub (/[ ]+$/, ""); # Strip trailing space and tab characters.
if (/^$/)
--- libprelude-5.1.1/src/libprelude-error/mkerrcodes1.awk 2018-12-23 21:59:17.341000000 +0100
+++ libprelude-5.1.1/src/libprelude-error/mkerrcodes1.awk 2019-07-11 17:35:02.737336699 +0200
@@ -78,7 +78,7 @@
}
!header {
- sub (/\#.+/, "");
+ sub (/#.+/, "");
sub (/[ ]+$/, ""); # Strip trailing space and tab characters.
if (/^$/)
--- libprelude-5.1.1/src/libprelude-error/mkerrcodes2.awk 2018-12-23 21:59:17.341000000 +0100
+++ libprelude-5.1.1/src/libprelude-error/mkerrcodes2.awk 2019-07-11 17:35:08.595219159 +0200
@@ -91,7 +91,7 @@
}
!header {
- sub (/\#.+/, "");
+ sub (/#.+/, "");
sub (/[ ]+$/, ""); # Strip trailing space and tab characters.
if (/^$/)
--- libprelude-5.1.1/src/libprelude-error/mkerrnos.awk 2019-07-11 17:41:09.385940916 +0200
+++ libprelude-5.1.1/src/libprelude-error/mkerrnos.awk 2019-07-11 17:41:22.455671539 +0200
@@ -80,7 +80,7 @@
}
!header {
- sub (/\#.+/, "");
+ sub (/#.+/, "");
sub (/[ ]+$/, ""); # Strip trailing space and tab characters.
if (/^$/)
--- libprelude-5.1.1/src/libprelude-error/mkstrtable.awk 2018-12-23 21:59:17.341000000 +0100
+++ libprelude-5.1.1/src/libprelude-error/mkstrtable.awk 2019-07-11 17:38:41.588950860 +0200
@@ -77,7 +77,7 @@
#
# The variable prefix can be used to prepend a string to each message.
#
-# The variable namespace can be used to prepend a string to each
+# The variable pkg_namespace can be used to prepend a string to each
# variable and macro name.
BEGIN {
@@ -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 " pkg_namespace "msgstr[] = ";
header = 0;
}
else
@@ -110,7 +110,7 @@
}
!header {
- sub (/\#.+/, "");
+ sub (/#.+/, "");
sub (/[ ]+$/, ""); # Strip trailing space and tab characters.
if (/^$/)
@@ -150,14 +150,14 @@
else
print " gettext_noop (\"" prefix last_msgstr "\");";
print "";
- print "static const int " namespace "msgidx[] =";
+ print "static const int " pkg_namespace "msgidx[] =";
print " {";
for (i = 0; i < coded_msgs; i++)
print " " pos[i] ",";
print " " pos[coded_msgs];
print " };";
print "";
- print "#define " namespace "msgidxof(code) (0 ? -1 \\";
+ print "#define " pkg_namespace "msgidxof(code) (0 ? -1 \\";
# Gather the ranges.
skip = code[0];
|