gawk5.patch 3.0 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120
  1. diff --git a/lang/cl/mkerrcodes.awk b/lang/cl/mkerrcodes.awk
  2. index ae29043..9a1fc18 100644
  3. --- a/lang/cl/mkerrcodes.awk
  4. +++ b/lang/cl/mkerrcodes.awk
  5. @@ -122,7 +122,7 @@ header {
  6. }
  7. !header {
  8. - sub (/\#.+/, "");
  9. + sub (/#.+/, "");
  10. sub (/[ ]+$/, ""); # Strip trailing space and tab characters.
  11. if (/^$/)
  12. diff --git a/src/Makefile.am b/src/Makefile.am
  13. index ce1b882..f2590cb 100644
  14. --- a/src/Makefile.am
  15. +++ b/src/Makefile.am
  16. @@ -293,7 +293,7 @@ code-from-errno.h: mkerrcodes$(EXEEXT_FOR_BUILD) Makefile
  17. errnos-sym.h: Makefile mkstrtable.awk errnos.in
  18. $(AWK) -f $(srcdir)/mkstrtable.awk -v textidx=2 -v nogettext=1 \
  19. - -v prefix=GPG_ERR_ -v namespace=errnos_ \
  20. + -v prefix=GPG_ERR_ -v pkg_namespace=errnos_ \
  21. $(srcdir)/errnos.in >$@
  22. diff --git a/src/mkerrcodes.awk b/src/mkerrcodes.awk
  23. index 46d436c..e9c857c 100644
  24. --- a/src/mkerrcodes.awk
  25. +++ b/src/mkerrcodes.awk
  26. @@ -85,7 +85,7 @@ header {
  27. }
  28. !header {
  29. - sub (/\#.+/, "");
  30. + sub (/#.+/, "");
  31. sub (/[ ]+$/, ""); # Strip trailing space and tab characters.
  32. if (/^$/)
  33. diff --git a/src/mkerrcodes1.awk b/src/mkerrcodes1.awk
  34. index a771a73..4578e29 100644
  35. --- a/src/mkerrcodes1.awk
  36. +++ b/src/mkerrcodes1.awk
  37. @@ -81,7 +81,7 @@ header {
  38. }
  39. !header {
  40. - sub (/\#.+/, "");
  41. + sub (/#.+/, "");
  42. sub (/[ ]+$/, ""); # Strip trailing space and tab characters.
  43. if (/^$/)
  44. diff --git a/src/mkerrcodes2.awk b/src/mkerrcodes2.awk
  45. index ea58503..188f7a4 100644
  46. --- a/src/mkerrcodes2.awk
  47. +++ b/src/mkerrcodes2.awk
  48. @@ -91,7 +91,7 @@ header {
  49. }
  50. !header {
  51. - sub (/\#.+/, "");
  52. + sub (/#.+/, "");
  53. sub (/[ ]+$/, ""); # Strip trailing space and tab characters.
  54. if (/^$/)
  55. diff --git a/src/mkerrnos.awk b/src/mkerrnos.awk
  56. index f79df66..15b1aad 100644
  57. --- a/src/mkerrnos.awk
  58. +++ b/src/mkerrnos.awk
  59. @@ -83,7 +83,7 @@ header {
  60. }
  61. !header {
  62. - sub (/\#.+/, "");
  63. + sub (/#.+/, "");
  64. sub (/[ ]+$/, ""); # Strip trailing space and tab characters.
  65. if (/^$/)
  66. diff --git a/src/mkstrtable.awk b/src/mkstrtable.awk
  67. index c9de9c1..152b2e3 100644
  68. --- a/src/mkstrtable.awk
  69. +++ b/src/mkstrtable.awk
  70. @@ -102,7 +102,7 @@ header {
  71. print "/* The purpose of this complex string table is to produce";
  72. print " optimal code with a minimum of relocations. */";
  73. print "";
  74. - print "static const char " namespace "msgstr[] = ";
  75. + print "static const char " pkg_namespace "msgstr[] = ";
  76. header = 0;
  77. }
  78. else
  79. @@ -110,7 +110,7 @@ header {
  80. }
  81. !header {
  82. - sub (/\#.+/, "");
  83. + sub (/#.+/, "");
  84. sub (/[ ]+$/, ""); # Strip trailing space and tab characters.
  85. if (/^$/)
  86. @@ -150,7 +150,7 @@ END {
  87. else
  88. print " gettext_noop (\"" last_msgstr "\");";
  89. print "";
  90. - print "static const int " namespace "msgidx[] =";
  91. + print "static const int " pkg_namespace "msgidx[] =";
  92. print " {";
  93. for (i = 0; i < coded_msgs; i++)
  94. print " " pos[i] ",";
  95. @@ -158,7 +158,7 @@ END {
  96. print " };";
  97. print "";
  98. print "static GPG_ERR_INLINE int";
  99. - print namespace "msgidxof (int code)";
  100. + print pkg_namespace "msgidxof (int code)";
  101. print "{";
  102. print " return (0 ? 0";