texlive[49770] Build/source/texk/web2c: Align gettext stuff.

[commits+ascherer at tug.org]

Revision: 49770
          http://tug.org/svn/texlive?view=revision&revision=49770
Author:   ascherer
Date:     2019-01-20 12:07:20 +0100 (Sun, 20 Jan 2019)
Log Message:
-----------
Align gettext stuff.

It was quite confusing that the '_' macro was not defined near the other
'gettext' stuff in 'comm-w2c.h'.

Modified Paths:
--------------
    trunk/Build/source/texk/web2c/ctangleboot.cin
    trunk/Build/source/texk/web2c/cwebdir/comm-w2c.h

Modified: trunk/Build/source/texk/web2c/ctangleboot.cin
===================================================================
--- trunk/Build/source/texk/web2c/ctangleboot.cin	2019-01-20 10:33:32 UTC (rev 49769)
+++ trunk/Build/source/texk/web2c/ctangleboot.cin	2019-01-20 11:07:20 UTC (rev 49770)
@@ -8,7 +8,7 @@
 #line 83 "cwebdir/ctangle.w"
 
 /*:2*//*6:*/
-#line 44 "cwebdir/comm-w2c.h"
+#line 45 "cwebdir/comm-w2c.h"
 
 #ifndef HAVE_GETTEXT
 #define HAVE_GETTEXT 0
@@ -51,6 +51,7 @@
 #define cweave 1
 #define ctwill 2 \
 
+#define _(STRING) gettext(STRING) 
 #define and_and 04
 #define lt_lt 020
 #define gt_gt 021
@@ -88,7 +89,6 @@
 #define fatal_message 3
 #define mark_harmless {if(history==spotless) history= harmless_message;}
 #define mark_error history= error_message
-#define _(STRING) gettext(STRING) 
 #define confusion(s) fatal(_("! This can't happen: ") ,s)  \
 
 #define max_file_name_length 1024
@@ -173,7 +173,7 @@
 extern int phase;
 
 /*:5*//*7:*/
-#line 78 "cwebdir/comm-w2c.h"
+#line 79 "cwebdir/comm-w2c.h"
 
 char section_text[longest_name+1];
 char*section_text_end= section_text+longest_name;
@@ -181,7 +181,7 @@
 char*id_loc;
 
 /*:7*//*8:*/
-#line 93 "cwebdir/comm-w2c.h"
+#line 94 "cwebdir/comm-w2c.h"
 
 extern char buffer[];
 extern char*buffer_end;
@@ -189,7 +189,7 @@
 extern char*limit;
 
 /*:8*//*9:*/
-#line 108 "cwebdir/comm-w2c.h"
+#line 109 "cwebdir/comm-w2c.h"
 
 typedef struct name_info{
 char*byte_start;

Modified: trunk/Build/source/texk/web2c/cwebdir/comm-w2c.h
===================================================================
--- trunk/Build/source/texk/web2c/cwebdir/comm-w2c.h	2019-01-20 10:33:32 UTC (rev 49769)
+++ trunk/Build/source/texk/web2c/cwebdir/comm-w2c.h	2019-01-20 11:07:20 UTC (rev 49770)
@@ -41,7 +41,8 @@
 extern int program; /* \.{CWEAVE} or \.{CTANGLE} or \.{CTWILL}? */
 extern int phase; /* which phase are we in? */
 
-@ @<Include files@>=
+@ @d _(STRING) gettext(STRING)
+@<Include files@>=
 #ifndef HAVE_GETTEXT
 #define HAVE_GETTEXT 0
 #endif
@@ -144,7 +145,6 @@
 @d fatal_message 3 /* |history| value when we had to stop prematurely */
 @d mark_harmless {if (history==spotless) history=harmless_message;}
 @d mark_error history=error_message
- at d _(STRING) gettext(STRING)
 @d confusion(s) fatal(_("! This can't happen: "),s)
 
 @<Common...@>=