summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Scherer <andreas_tex@freenet.de>2019-01-20 11:07:20 +0000
committerAndreas Scherer <andreas_tex@freenet.de>2019-01-20 11:07:20 +0000
commit2e4fdfaf111ee9b97b0783757725d1eae92e42ba (patch)
treebb898ddc1ec426b6e4970b1ce17cfa16983c9f89
parent1c5eceede59b4b9a48ef00d9ccc6c05e84e92acb (diff)
Align gettext stuff.
It was quite confusing that the '_' macro was not defined near the other 'gettext' stuff in 'comm-w2c.h'. git-svn-id: svn://tug.org/texlive/trunk@49770 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Build/source/texk/web2c/ctangleboot.cin10
-rw-r--r--Build/source/texk/web2c/cwebdir/comm-w2c.h4
2 files changed, 7 insertions, 7 deletions
diff --git a/Build/source/texk/web2c/ctangleboot.cin b/Build/source/texk/web2c/ctangleboot.cin
index 267be8fc151..21b3cf5c6cb 100644
--- a/Build/source/texk/web2c/ctangleboot.cin
+++ b/Build/source/texk/web2c/ctangleboot.cin
@@ -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 program;
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_first;
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*loc;
extern char*limit;
/*:8*//*9:*/
-#line 108 "cwebdir/comm-w2c.h"
+#line 109 "cwebdir/comm-w2c.h"
typedef struct name_info{
char*byte_start;
diff --git a/Build/source/texk/web2c/cwebdir/comm-w2c.h b/Build/source/texk/web2c/cwebdir/comm-w2c.h
index d0b99f5db03..2c8e2868a59 100644
--- a/Build/source/texk/web2c/cwebdir/comm-w2c.h
+++ b/Build/source/texk/web2c/cwebdir/comm-w2c.h
@@ -41,7 +41,8 @@ typedef uint16_t sixteen_bits;
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 @@ extern void sprint_section_name(char *,name_pointer);@/
@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
-@d _(STRING) gettext(STRING)
@d confusion(s) fatal(_("! This can't happen: "),s)
@<Common...@>=