use ANSI C function declarations, drop P?[CH] macros

git-svn-id: svn://tug.org/texlive/trunk@13924 c570f23f-e606-0410-a88d-b1316a301751

10 files changed, 271 insertions, 258 deletions

diff --git a/Build/source/texk/web2c/ctangleboot.c b/Build/source/texk/web2c/ctangleboot.c
index edfb55a0d90..254cdf40357 100644
--- a/Build/source/texk/web2c/ctangleboot.c
+++ b/Build/source/texk/web2c/ctangleboot.c
@@ -22,16 +22,16 @@ extern char*versionstring;
 
 #define banner "This is CTANGLE, Version 3.64" \
 
-#define max_bytes 90000 \
+#define max_bytes 1000000 \
 
-#define max_toks 270000
-#define max_names 4000 \
+#define max_toks 1000000
+#define max_names 10239 \
 
-#define max_texts 2500
-#define hash_size 353
+#define max_texts 10239
+#define hash_size 8501
 #define longest_name 10000
 #define stack_size 50
-#define buf_size 100 \
+#define buf_size 1000 \
 
 #define ctangle 0
 #define cweave 1 \
@@ -194,11 +194,11 @@ extern hash_pointer hash_end;
 extern hash_pointer h;
 #line 106 "./cwebdir/ctang-w2c.ch"
 
-extern name_pointer id_lookup P3H(char*,char*,char);
+extern name_pointer id_lookup(char*,char*,char);
 
-extern name_pointer section_lookup P3H(char*,char*,char);
-extern void print_section_name P1H(name_pointer);
-extern void sprint_section_name P2H(char*,name_pointer);
+extern name_pointer section_lookup(char*,char*,char);
+extern void print_section_name(name_pointer);
+extern void sprint_section_name(char*,name_pointer);
 #line 112 "./cwebdir/common.h"
 
 /*:8*//*9:*/
@@ -206,10 +206,10 @@ extern void sprint_section_name P2H(char*,name_pointer);
 
 #line 123 "./cwebdir/ctang-w2c.ch"
 extern int history;
-extern void err_print P1H(char*);
-extern int wrap_up P1H(void);
-extern void fatal P2H(char*,char*);
-extern void overflow P1H(char*);
+extern void err_print(char*);
+extern int wrap_up(void);
+extern void fatal(char*,char*);
+extern void overflow(char*);
 #line 128 "./cwebdir/common.h"
 
 /*:9*//*10:*/
@@ -235,9 +235,9 @@ extern boolean input_has_ended;
 extern boolean changing;
 extern boolean web_file_open;
 #line 157 "./cwebdir/ctang-w2c.ch"
-extern void reset_input P1H(void);
-extern int get_line P1H(void);
-extern void check_complete P1H(void);
+extern void reset_input(void);
+extern int get_line(void);
+extern void check_complete(void);
 #line 156 "./cwebdir/common.h"
 
 /*:10*//*11:*/
@@ -269,7 +269,7 @@ extern FILE*active_file;
 #line 191 "./cwebdir/common.h"
 
 #line 167 "./cwebdir/ctang-w2c.ch"
-extern void common_init P1H(void);
+extern void common_init(void);
 #line 128 "./cwebdir/ctangle.w"
 
 /*:14*/
@@ -386,35 +386,35 @@ extern sixteen_bits section_count;
 #line 533 "./cwebdir/ctangle.w"
 
 #line 244 "./cwebdir/ctang-w2c.ch"
-void phase_two P1H(void);
+void phase_two(void);
 #line 535 "./cwebdir/ctangle.w"
 
 /*:40*//*45:*/
 #line 602 "./cwebdir/ctangle.w"
 
 #line 260 "./cwebdir/ctang-w2c.ch"
-void output_defs P1H(void);
+void output_defs(void);
 #line 604 "./cwebdir/ctangle.w"
 
 /*:45*//*47:*/
 #line 648 "./cwebdir/ctangle.w"
 
 #line 276 "./cwebdir/ctang-w2c.ch"
-static void out_char P1H(eight_bits);
+static void out_char(eight_bits);
 #line 650 "./cwebdir/ctangle.w"
 
 /*:47*//*89:*/
 #line 1457 "./cwebdir/ctangle.w"
 
 #line 342 "./cwebdir/ctang-w2c.ch"
-void phase_one P1H(void);
+void phase_one(void);
 #line 1459 "./cwebdir/ctangle.w"
 
 /*:89*//*91:*/
 #line 1475 "./cwebdir/ctangle.w"
 
 #line 358 "./cwebdir/ctang-w2c.ch"
-void skip_limbo P1H(void);
+void skip_limbo(void);
 #line 1477 "./cwebdir/ctangle.w"
 
 /*:91*/
@@ -427,7 +427,7 @@ void skip_limbo P1H(void);
 #line 91 "./cwebdir/ctangle.w"
 
 #line 70 "./cwebdir/ctang-w2c.ch"
-int main P2C(int,ac,char**,av)
+int main(int ac,char**av)
 #line 95 "./cwebdir/ctangle.w"
 {
 argc= ac;argv= av;
@@ -503,7 +503,7 @@ return wrap_up();
 #line 183 "./cwebdir/ctangle.w"
 
 #line 178 "./cwebdir/ctang-w2c.ch"
-int names_match P4C(name_pointer,p,char*,first,int,l,char,t)
+int names_match(name_pointer p,char*first,int l,char t)
 #line 188 "./cwebdir/ctangle.w"
 {
 if(length(p)!=l)return 0;
@@ -515,14 +515,14 @@ return!strncmp(first,p->byte_start,l);
 
 void
 #line 187 "./cwebdir/ctang-w2c.ch"
- init_node P1C(name_pointer,node)
+ init_node(name_pointer node)
 #line 202 "./cwebdir/ctangle.w"
 {
 node->equiv= (char*)text_info;
 }
 void
 #line 193 "./cwebdir/ctang-w2c.ch"
- init_p P2C(name_pointer,p,char,t){}
+ init_p(name_pointer p,char t){}
 #line 207 "./cwebdir/ctangle.w"
 
 /*:21*//*25:*/
@@ -530,7 +530,7 @@ void
 
 void
 #line 202 "./cwebdir/ctang-w2c.ch"
- store_two_bytes P1C(sixteen_bits,x)
+ store_two_bytes(sixteen_bits x)
 #line 264 "./cwebdir/ctangle.w"
 {
 if(tok_ptr+2> tok_mem_end)overflow("token");
@@ -543,7 +543,7 @@ if(tok_ptr+2> tok_mem_end)overflow("token");
 
 void
 #line 211 "./cwebdir/ctang-w2c.ch"
- push_level P1C(name_pointer,p)
+ push_level(name_pointer p)
 #line 340 "./cwebdir/ctangle.w"
 {
 if(stack_ptr==stack_end)overflow("stack");
@@ -561,7 +561,7 @@ cur_section= 0;
 
 void
 #line 220 "./cwebdir/ctang-w2c.ch"
- pop_level P1C(int,flag)
+ pop_level(int flag)
 #line 359 "./cwebdir/ctangle.w"
 {
 if(flag&&cur_repl->text_link<section_flag){
@@ -578,7 +578,7 @@ if(stack_ptr> stack)cur_state= *stack_ptr;
 
 void
 #line 228 "./cwebdir/ctang-w2c.ch"
- get_output P1H(void)
+ get_output(void)
 #line 394 "./cwebdir/ctangle.w"
 {
 sixteen_bits a;
@@ -627,7 +627,7 @@ out_char(section_number);
 
 void
 #line 236 "./cwebdir/ctang-w2c.ch"
- flush_buffer P1H(void)
+ flush_buffer(void)
 #line 484 "./cwebdir/ctangle.w"
 {
 C_putc('\n');
@@ -644,7 +644,7 @@ cur_line++;
 
 void
 #line 252 "./cwebdir/ctang-w2c.ch"
- phase_two P1H(void){
+ phase_two(void){
 #line 539 "./cwebdir/ctangle.w"
 web_file_open= 0;
 cur_line= 1;
@@ -719,7 +719,7 @@ if(show_happiness)printf("\nDone.");
 
 void
 #line 268 "./cwebdir/ctang-w2c.ch"
- output_defs P1H(void)
+ output_defs(void)
 #line 608 "./cwebdir/ctangle.w"
 {
 sixteen_bits a;
@@ -761,7 +761,7 @@ pop_level(0);
 
 static void
 #line 285 "./cwebdir/ctang-w2c.ch"
- out_char P1C(eight_bits,cur_char)
+ out_char(eight_bits cur_char)
 #line 655 "./cwebdir/ctangle.w"
 {
 char*j,*k;
@@ -863,7 +863,7 @@ default:C_putc(cur_char);out_state= normal;break;
 
 eight_bits
 #line 293 "./cwebdir/ctang-w2c.ch"
- skip_ahead P1H(void)
+ skip_ahead(void)
 #line 816 "./cwebdir/ctangle.w"
 {
 eight_bits c;
@@ -882,7 +882,7 @@ if(c!=ignore||*(loc-1)=='>')return(c);
 #line 848 "./cwebdir/ctangle.w"
 
 #line 302 "./cwebdir/ctang-w2c.ch"
-int skip_comment P1C(boolean,is_long_comment)
+int skip_comment(boolean is_long_comment)
 #line 851 "./cwebdir/ctangle.w"
 {
 char c;
@@ -918,7 +918,7 @@ else loc++;
 
 eight_bits
 #line 317 "./cwebdir/ctang-w2c.ch"
- get_next P1H(void)
+ get_next(void)
 #line 903 "./cwebdir/ctangle.w"
 {
 static int preprocessing= 0;
@@ -1230,7 +1230,7 @@ return(c);
 
 void
 #line 326 "./cwebdir/ctang-w2c.ch"
- scan_repl P1C(eight_bits,t)
+ scan_repl(eight_bits t)
 #line 1203 "./cwebdir/ctangle.w"
 {
 sixteen_bits a;
@@ -1415,7 +1415,7 @@ cur_text= text_ptr;(++text_ptr)->tok_start= tok_ptr;
 
 void
 #line 334 "./cwebdir/ctang-w2c.ch"
- scan_section P1H(void)
+ scan_section(void)
 #line 1360 "./cwebdir/ctangle.w"
 {
 name_pointer p;
@@ -1528,7 +1528,7 @@ cur_text->text_link= section_flag;
 
 void
 #line 350 "./cwebdir/ctang-w2c.ch"
- phase_one P1H(void){
+ phase_one(void){
 #line 1463 "./cwebdir/ctangle.w"
 phase= 1;
 section_count= 0;
@@ -1544,7 +1544,7 @@ phase= 2;
 
 void
 #line 366 "./cwebdir/ctang-w2c.ch"
- skip_limbo P1H(void)
+ skip_limbo(void)
 #line 1481 "./cwebdir/ctangle.w"
 {
 char c;
@@ -1604,7 +1604,7 @@ default:err_print("! Double @ should be used in limbo");
 
 void
 #line 374 "./cwebdir/ctang-w2c.ch"
- print_stats P1H(void){
+ print_stats(void){
 #line 1536 "./cwebdir/ctangle.w"
 printf("\nMemory usage statistics:\n");
 printf("%ld names (out of %ld)\n",
diff --git a/Build/source/texk/web2c/ctiedir/ChangeLog b/Build/source/texk/web2c/ctiedir/ChangeLog
index 92650a4454c..046d4c8b73f 100644
--- a/Build/source/texk/web2c/ctiedir/ChangeLog
+++ b/Build/source/texk/web2c/ctiedir/ChangeLog
@@ -1,3 +1,7 @@
+2009-06-23  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* ctie-k.ch: drop P?C, P?H, use ANSI C function declarations.
+
 2005-02-05  Olaf Weber  <olaf@infovore.xs4all.nl>
 
 	* ctie.1: Correct header from TIE to CTIE.
diff --git a/Build/source/texk/web2c/ctiedir/ctie-k.ch b/Build/source/texk/web2c/ctiedir/ctie-k.ch
index 88e8d840b59..9f0accdac0a 100644
--- a/Build/source/texk/web2c/ctiedir/ctie-k.ch
+++ b/Build/source/texk/web2c/ctiedir/ctie-k.ch
@@ -29,7 +29,7 @@
 main(argc, argv)
         int argc; string *argv;
 @y
-int main @,P2C(int, argc, string *, argv)
+int main (int argc, string *argv)
 @z
 
 @x l.105 Set up kpathsea stuff
@@ -140,7 +140,7 @@ too.
 boolean get_line(i, do_includes)
         file_index i; boolean do_includes;
 @y
-boolean get_line @,P2C(file_index, i, boolean, do_includes)
+boolean get_line (file_index i, boolean do_includes)
 @z
 
 The next piece is simplified using the kpathsea kpse_find_file
@@ -220,40 +220,40 @@ variable) to search for this file.
 @x l.585
 void err_print();
 @y
-void err_print @,P2H(file_index, char *);
+void err_print (file_index, char *);
 @z
 
 @x l.590
 void err_print(i, s) /* prints `\..' and location of error message */
 file_index i; char *s;
 @y
-void err_print @,P2C(file_index, i, char *, s)
+void err_print (file_index i, char *s)
 /* prints `\..' and location of error message */
 @z
 
 @x l.664
 int wrap_up()
 @y
-int wrap_up @,P1H(void)
+int wrap_up (void)
 @z
 
 @x l.674
 int wrap_up();
 @y
-int wrap_up @,P1H(void);
+int wrap_up (void);
 @z
 
 @x l.697
 void pfatal_error();
 @y
-void pfatal_error @,P2H(char *, char *);
+void pfatal_error (char *, char *);
 @z
 
 @x l.700
 void pfatal_error(s, t)
 char *s, *t;
 @y
-void pfatal_error @,P2C(char *, s, char *, t)
+void pfatal_error (char *s, char *t)
 @z
 
 @x l.747 Use the kpathsea library to do this
@@ -339,41 +339,41 @@ the file.
 boolean lines_dont_match(i, j)
         file_index i, j;
 @y
-boolean lines_dont_match @,P2C(file_index, i, file_index, j)
+boolean lines_dont_match (file_index i, file_index j)
 @z
 
 @x l.809
 void init_change_file(i)
         file_index i;
 @y
-void init_change_file @,P1C(file_index, i)
+void init_change_file (file_index i)
 @z
 
 @x l.858
 void put_line(j)
        file_index j;
 @y
-void put_line @,P1C(file_index, j)
+void put_line (file_index j)
 @z
 
 @x l.873
 boolean e_of_ch_module(i)
         file_index i;
 @y
-boolean e_of_ch_module @,P1C(file_index, i)
+boolean e_of_ch_module (file_index i)
 @z
 
 @x l.894
 boolean e_of_ch_preamble(i)
         file_index i;
 @y
-boolean e_of_ch_preamble @,P1C(file_index, i)
+boolean e_of_ch_preamble (file_index i)
 @z
 
 @x l.1106
 void usage_error()
 @y
-void usage_error @,P1H(void)
+void usage_error (void)
 @z
 
 @x l.1119 Add Web2C version to banner string
@@ -389,14 +389,14 @@ printf("%s\n", banner); /* print a ``banner line'' */
 void usage_help();
 void print_version_and_exit();
 @y
-void usage_help @,P1H(void);
-void print_version_and_exit @,P2H(string, string);
+void usage_help (void);
+void print_version_and_exit (string, string);
 @z
 
 @x l.1238
 void usage_help()
 @y
-void usage_help @,P1H(void)
+void usage_help (void)
 @z
 
 @x l.1253
@@ -413,7 +413,7 @@ void print_version_and_exit(name, version)
     exit (0);
 }
 @y
-void print_version_and_exit @,P2C(string, name, string, version)
+void print_version_and_exit (string name, string version)
 {
     extern KPSEDLL string kpathsea_version_string; /* from kpathsea/version.c */
     printf ("%s %s\n", name, version);
diff --git a/Build/source/texk/web2c/cwebboot.c b/Build/source/texk/web2c/cwebboot.c
index 30f96a37712..f30844a77af 100644
--- a/Build/source/texk/web2c/cwebboot.c
+++ b/Build/source/texk/web2c/cwebboot.c
@@ -43,7 +43,7 @@
 #define period_ast 026
 #define minus_gt_ast 027 \
 
-#define buf_size 100
+#define buf_size 1000
 #define longest_name 1000
 #define long_buf_size (buf_size+longest_name) 
 #define xisspace(c) (isspace(c) &&((unsigned char) c<0200) ) 
@@ -67,7 +67,7 @@ for(loc= buffer;xisspace(*loc) ;loc++) ; \
 if(*loc=='@'&&(xisspace(*(loc+1) ) ||*(loc+1) =='*') ) change_pending= b; \
 } \
 
-#define max_sections 2000 \
+#define max_sections 10239 \
  \
 
 #define too_long() {include_depth--; \
@@ -75,15 +75,15 @@ err_print("! Include file name too long") ;goto restart;} \
 
 #define kpse_find_cweb(name) kpse_find_file(name,kpse_cweb_format,true)  \
 
-#define max_bytes 90000 \
+#define max_bytes 1000000 \
 
-#define max_names 4000 \
+#define max_names 10239 \
  \
 
 #define length(c) (c+1) ->byte_start-(c) ->byte_start
 #define print_id(c) term_write((c) ->byte_start,length((c) ) )  \
 
-#define hash_size 353 \
+#define hash_size 8501 \
 
 #define llink link
 #define rlink dummy.Rlink
@@ -273,50 +273,50 @@ char*change_limit;
 #line 650 "./cwebdir/common.w"
 
 #line 260 "./cwebdir/comm-w2c.ch"
-extern int names_match P4H(name_pointer,char*,int,char);
+extern int names_match(name_pointer,char*,int,char);
 #line 652 "./cwebdir/common.w"
 
 /*:35*//*40:*/
 #line 703 "./cwebdir/common.w"
 
 #line 280 "./cwebdir/comm-w2c.ch"
-extern void init_p P2C(name_pointer,p,char,t);
+extern void init_p(name_pointer p,char t);
 #line 705 "./cwebdir/common.w"
 
 /*:40*//*48:*/
 #line 852 "./cwebdir/common.w"
 
 #line 327 "./cwebdir/comm-w2c.ch"
-extern void init_node P1C(name_pointer,node);
+extern void init_node(name_pointer node);
 #line 854 "./cwebdir/common.w"
 
 /*:48*//*55:*/
 #line 1017 "./cwebdir/common.w"
 
 #line 373 "./cwebdir/comm-w2c.ch"
-int section_name_cmp P3H(char**,int,name_pointer);
+int section_name_cmp(char**,int,name_pointer);
 #line 1019 "./cwebdir/common.w"
 
 /*:55*//*59:*/
 #line 1092 "./cwebdir/common.w"
 
 #line 392 "./cwebdir/comm-w2c.ch"
-void err_print P1H(char*);
+void err_print(char*);
 #line 1094 "./cwebdir/common.w"
 
 /*:59*//*62:*/
 #line 1140 "./cwebdir/common.w"
 
 #line 410 "./cwebdir/comm-w2c.ch"
-int wrap_up P1H(void);
-extern void print_stats P1H(void);
+int wrap_up(void);
+extern void print_stats(void);
 #line 1143 "./cwebdir/common.w"
 
 /*:62*//*65:*/
 #line 1173 "./cwebdir/common.w"
 
 #line 427 "./cwebdir/comm-w2c.ch"
-void fatal P2H(char*,char*);
+void fatal(char*,char*);
 void overflow(char*);
 #line 1175 "./cwebdir/common.w"
 
@@ -324,7 +324,7 @@ void overflow(char*);
 #line 1251 "./cwebdir/common.w"
 
 #line 495 "./cwebdir/comm-w2c.ch"
-void scan_args P1H(void);
+void scan_args(void);
 #line 1253 "./cwebdir/common.w"
 
 /*:71*/
@@ -336,7 +336,7 @@ void scan_args P1H(void);
 
 void
 #line 51 "./cwebdir/comm-w2c.ch"
- common_init P1H(void)
+ common_init(void)
 #line 92 "./cwebdir/common.w"
 {
 #line 57 "./cwebdir/comm-w2c.ch"
@@ -403,7 +403,7 @@ fatal("! Cannot open output file ",tex_file_name);
 #line 172 "./cwebdir/common.w"
 
 #line 67 "./cwebdir/comm-w2c.ch"
-int input_ln P1C(FILE*,fp)
+int input_ln(FILE*fp)
 #line 175 "./cwebdir/common.w"
 {
 register int c= EOF;
@@ -427,7 +427,7 @@ return(1);
 
 void
 #line 88 "./cwebdir/comm-w2c.ch"
- prime_the_change_buffer P1H(void)
+ prime_the_change_buffer(void)
 #line 254 "./cwebdir/common.w"
 {
 change_limit= change_buffer;
@@ -484,7 +484,7 @@ strncpy(change_buffer,buffer,limit-buffer+1);
 
 void
 #line 96 "./cwebdir/comm-w2c.ch"
- check_change P1H(void)
+ check_change(void)
 #line 323 "./cwebdir/common.w"
 {
 int n= 0;
@@ -555,7 +555,7 @@ if(lines_dont_match)n++;
 
 void
 #line 104 "./cwebdir/comm-w2c.ch"
- reset_input P1H(void)
+ reset_input(void)
 #line 381 "./cwebdir/common.w"
 {
 limit= buffer;loc= buffer+1;buffer[0]= ' ';
@@ -597,7 +597,7 @@ limit= buffer;loc= buffer+1;buffer[0]= ' ';input_has_ended= 0;
 #line 426 "./cwebdir/common.w"
 
 #line 143 "./cwebdir/comm-w2c.ch"
-int get_line P1H(void)
+int get_line(void)
 #line 428 "./cwebdir/common.w"
 {
 restart:
@@ -722,7 +722,7 @@ return 1;
 
 void
 #line 252 "./cwebdir/comm-w2c.ch"
- check_complete P1H(void){
+ check_complete(void){
 #line 572 "./cwebdir/common.w"
 if(change_limit!=change_buffer){
 strncpy(buffer,change_buffer,change_limit-change_buffer+1);
@@ -739,7 +739,7 @@ err_print("! Change file entry did not match");
 name_pointer
 #line 271 "./cwebdir/comm-w2c.ch"
 
-id_lookup P3C(char*,first,char*,last,char,t)
+id_lookup(char*first,char*last,char t)
 #line 666 "./cwebdir/common.w"
 {
 char*i= first;
@@ -792,7 +792,7 @@ return(p);
 
 void
 #line 289 "./cwebdir/comm-w2c.ch"
- print_section_name P1C(name_pointer,p)
+ print_section_name(name_pointer p)
 #line 768 "./cwebdir/common.w"
 {
 char*ss,*s= first_chunk(p);
@@ -814,7 +814,7 @@ if(q)term_write("...",3);
 
 void
 #line 299 "./cwebdir/comm-w2c.ch"
- sprint_section_name P2C(char*,dest,name_pointer,p)
+ sprint_section_name(char*dest,name_pointer p)
 #line 788 "./cwebdir/common.w"
 {
 char*ss,*s= first_chunk(p);
@@ -837,7 +837,7 @@ s= p->byte_start;
 
 void
 #line 308 "./cwebdir/comm-w2c.ch"
- print_prefix_name P1C(name_pointer,p)
+ print_prefix_name(name_pointer p)
 #line 808 "./cwebdir/common.w"
 {
 char*s= first_chunk(p);
@@ -851,7 +851,7 @@ if(s+l<(p+1)->byte_start)term_write("...",3);
 
 #line 318 "./cwebdir/comm-w2c.ch"
 
-int web_strcmp P4C(char*,j,int,j_len,char*,k,int,k_len)
+int web_strcmp(char*j,int j_len,char*k,int k_len)
 #line 829 "./cwebdir/common.w"
 {
 char*j1= j+j_len,*k1= k+k_len;
@@ -869,8 +869,8 @@ else return greater;
 name_pointer
 #line 340 "./cwebdir/comm-w2c.ch"
 
-add_section_name P5C(name_pointer,par,int,c,char*,first,char*,last,
-int,ispref)
+add_section_name(name_pointer par,int c,char*first,char*last,
+int ispref)
 #line 863 "./cwebdir/common.w"
 {
 name_pointer p= name_ptr;
@@ -898,7 +898,7 @@ return par==NULL?(root= p):c==less?(par->llink= p):(par->rlink= p);
 
 void
 #line 354 "./cwebdir/comm-w2c.ch"
- extend_section_name P4C(name_pointer,p,char*,first,char*,last,int,ispref)
+ extend_section_name(name_pointer p,char*first,char*last,int ispref)
 #line 891 "./cwebdir/common.w"
 {
 char*s;
@@ -921,7 +921,7 @@ if(ispref)*(byte_ptr-1)= ' ';
 name_pointer
 #line 364 "./cwebdir/comm-w2c.ch"
 
-section_lookup P3C(char*,first,char*,last,int,ispref)
+section_lookup(char*first,char*last,int ispref)
 #line 917 "./cwebdir/common.w"
 {
 int c= 0;
@@ -1013,7 +1013,7 @@ return r;
 #line 1020 "./cwebdir/common.w"
 
 #line 384 "./cwebdir/comm-w2c.ch"
-int section_name_cmp P3C(char**,pfirst,int,len,name_pointer,r)
+int section_name_cmp(char**pfirst,int len,name_pointer r)
 #line 1025 "./cwebdir/common.w"
 {
 char*first= *pfirst;
@@ -1047,7 +1047,7 @@ default:return c;
 
 void
 #line 401 "./cwebdir/comm-w2c.ch"
- err_print P1C(char*,s)
+ err_print(char*s)
 #line 1099 "./cwebdir/common.w"
 {
 char*k,*l;
@@ -1082,7 +1082,7 @@ update_terminal;mark_error;
 #line 1150 "./cwebdir/common.w"
 
 #line 419 "./cwebdir/comm-w2c.ch"
-int wrap_up P1H(void){
+int wrap_up(void){
 #line 1152 "./cwebdir/common.w"
 putchar('\n');
 if(show_stats)
@@ -1110,7 +1110,7 @@ else return(0);
 #line 1179 "./cwebdir/common.w"
 void
 #line 437 "./cwebdir/comm-w2c.ch"
- fatal P2C(char*,s,char*,t)
+ fatal(char*s,char*t)
 #line 1182 "./cwebdir/common.w"
 {
 if(*s)printf(s);
@@ -1122,7 +1122,7 @@ history= fatal_message;exit(wrap_up());
 #line 1190 "./cwebdir/common.w"
 void
 #line 446 "./cwebdir/comm-w2c.ch"
- overflow P1C(char*,t)
+ overflow(char*t)
 #line 1193 "./cwebdir/common.w"
 {
 printf("\n! Sorry, %s capacity exceeded",t);fatal("","");
@@ -1134,7 +1134,7 @@ printf("\n! Sorry, %s capacity exceeded",t);fatal("","");
 
 void
 #line 504 "./cwebdir/comm-w2c.ch"
- scan_args P1H(void)
+ scan_args(void)
 #line 1257 "./cwebdir/common.w"
 {
 char*dot_pos;
@@ -1164,7 +1164,7 @@ if(strcmp("-version",*argv)==0||strcmp("--version",*argv)==0)
 #line 614 "./cwebdir/comm-w2c.ch"
 
 printversionandexit((program==ctangle?ctangle_banner:cweave_banner),
-"Silvio Levy and Donald E. Knuth",NULL, NULL);
+"Silvio Levy and Donald E. Knuth",NULL,NULL);
 
 
 /*:85*/
diff --git a/Build/source/texk/web2c/cwebdir/ChangeLog b/Build/source/texk/web2c/cwebdir/ChangeLog
new file mode 100644
index 00000000000..4e03484a507
--- /dev/null
+++ b/Build/source/texk/web2c/cwebdir/ChangeLog
@@ -0,0 +1,5 @@
+2009-06-23  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* comm-w2c.ch, ctang-w2c.ch, cweav-w2c.ch: drop P?C, P?H macros,
+	use ANSI C function declarations.
+
diff --git a/Build/source/texk/web2c/cwebdir/comm-w2c.ch b/Build/source/texk/web2c/cwebdir/comm-w2c.ch
index 40c65a814e1..88695e29a2e 100644
--- a/Build/source/texk/web2c/cwebdir/comm-w2c.ch
+++ b/Build/source/texk/web2c/cwebdir/comm-w2c.ch
@@ -48,7 +48,7 @@ Section 4.
 @x l.91
 common_init()
 @y
-common_init P1H(void)
+common_init (void)
 @z
 
 @x l.93
@@ -64,7 +64,7 @@ Section 9.
 int input_ln(fp) /* copies a line into |buffer| or returns 0 */
 FILE *fp; /* what file to read from */
 @y
-int input_ln P1C(FILE *, fp) /* copies a line into |buffer| or returns 0 */
+int input_ln (FILE *fp) /* copies a line into |buffer| or returns 0 */
 @z
 
 Section 10.
@@ -85,7 +85,7 @@ Section 12.
 @x l.254
 prime_the_change_buffer()
 @y
-prime_the_change_buffer P1H(void)
+prime_the_change_buffer (void)
 @z
 
 Section 16.
@@ -93,7 +93,7 @@ Section 16.
 @x l.322
 check_change() /* switches to |change_file| if the buffers match */
 @y
-check_change P1H(void) /* switches to |change_file| if the buffers match */
+check_change (void) /* switches to |change_file| if the buffers match */
 @z
 
 Section 18.
@@ -101,7 +101,7 @@ Section 18.
 @x l.380
 reset_input()
 @y
-reset_input P1H(void)
+reset_input (void)
 @z
 
 Section 19.
@@ -140,7 +140,7 @@ Section 21.
 @x l.427
 int get_line() /* inputs the next line */
 @y
-int get_line P1H(void) /* inputs the next line */
+int get_line (void) /* inputs the next line */
 @z
 
 Section 22.
@@ -249,7 +249,7 @@ Section 26.
 @x l.571
 check_complete(){
 @y
-check_complete P1H(void) {
+check_complete (void) {
 @z
 
 Section 33.
@@ -257,7 +257,7 @@ Section 33.
 @x l.651
 extern int names_match();
 @y
-extern int names_match P4H(name_pointer, char*, int, char);
+extern int names_match (name_pointer, char*, int, char);
 @z
 
 Section 35.
@@ -269,7 +269,7 @@ char *last; /* last character of string plus one */
 char t; /* the |ilk|; used by \.{CWEAVE} only */
 @y
 /* looks up a string in the identifier table */
-id_lookup P3C(char*,first, char*,last, char,t)
+id_lookup (char *first, char *last, char t)
 @z
 
 Section 38.
@@ -277,7 +277,7 @@ Section 38.
 @x l.704
 void init_p();
 @y
-extern void init_p P2C(name_pointer,p, char,t);
+extern void init_p (name_pointer p, char t);
 @z
 
 Section 42.
@@ -286,7 +286,7 @@ Section 42.
 print_section_name(p)
 name_pointer p;
 @y
-print_section_name P1C(name_pointer, p)
+print_section_name (name_pointer p)
 @z
 
 Section 43.
@@ -296,7 +296,7 @@ sprint_section_name(dest,p)
   char*dest;
   name_pointer p;
 @y
-sprint_section_name P2C(char*,dest, name_pointer,p)
+sprint_section_name (char *dest, name_pointer p)
 @z
 
 Section 44.
@@ -305,7 +305,7 @@ Section 44.
 print_prefix_name(p)
 name_pointer p;
 @y
-print_prefix_name P1C(name_pointer,p)
+print_prefix_name (name_pointer p)
 @z
 
 Section 45.
@@ -316,7 +316,7 @@ int web_strcmp(j,j_len,k,k_len) /* fuller comparison than |strcmp| */
   int j_len, k_len; /* length of strings */
 @y
 /* fuller comparison than |strcmp| */
-int web_strcmp P4C(char*,j, int,j_len, char*,k, int,k_len)
+int web_strcmp (char *j, int j_len, char *k, int k_len)
 @z
 
 Section 46.
@@ -324,7 +324,7 @@ Section 46.
 @x l.853
 extern void init_node();
 @y
-extern void init_node P1C(name_pointer,node);
+extern void init_node (name_pointer node);
 @z
 
 Section 47.
@@ -338,8 +338,8 @@ char *last; /* last character of section name, plus one */
 int ispref; /* are we adding a prefix or a full name? */
 @y
 /* install a new node in the tree */
-add_section_name P5C(name_pointer,par, int,c, char*,first, char*,last,
-                     int,ispref)
+add_section_name (name_pointer par, int c, char *first, char *last,
+                  int ispref)
 @z
 
 Section 48.
@@ -351,7 +351,7 @@ char *first; /* beginning of extension text */
 char *last; /* one beyond end of extension text */
 int ispref; /* are we adding a prefix or a full name? */
 @y
-extend_section_name P4C(name_pointer,p, char*,first, char*,last, int,ispref)
+extend_section_name (name_pointer p, char *first, char *last, int ispref)
 @z
 
 Section 49.
@@ -362,7 +362,7 @@ char *first, *last; /* first and last characters of new name */
 int ispref; /* is the new name a prefix or a full name? */
 @y
 /* find or install section name in tree */
-section_lookup P3C(char*,first, char*,last, int,ispref)
+section_lookup (char *first, char *last, int ispref)
 @z
 
 Section 53.
@@ -370,7 +370,7 @@ Section 53.
 @x l.1018
 int section_name_cmp();
 @y
-int section_name_cmp P3H(char**, int, name_pointer);
+int section_name_cmp (char**, int, name_pointer);
 @z
 
 Section 54.
@@ -381,7 +381,7 @@ char **pfirst; /* pointer to beginning of comparison string */
 int len; /* length of string */
 name_pointer r; /* section name being compared */
 @y
-int section_name_cmp P3C(char**,pfirst, int,len, name_pointer,r)
+int section_name_cmp (char **pfirst, int len, name_pointer r)
 @z
 
 Section 57.
@@ -389,7 +389,7 @@ Section 57.
 @x l.1093
 void  err_print();
 @y
-void  err_print P1H(char*);
+void  err_print (char*);
 @z
 
 Section 58.
@@ -398,7 +398,7 @@ Section 58.
 err_print(s) /* prints `\..' and location of error message */
 char *s;
 @y
-err_print P1C(char*,s) /* prints `\..' and location of error message */
+err_print (char *s) /* prints `\..' and location of error message */
 @z
 
 Section 60.
@@ -407,8 +407,8 @@ Section 60.
 int wrap_up();
 extern void print_stats();
 @y
-int wrap_up P1H(void);
-extern void print_stats P1H(void);
+int wrap_up (void);
+extern void print_stats (void);
 @z
 
 Section 61.
@@ -416,7 +416,7 @@ Section 61.
 @x l.1151
 int wrap_up() {
 @y
-int wrap_up P1H(void) {
+int wrap_up (void) {
 @z
 
 Section 63.
@@ -424,8 +424,8 @@ Section 63.
 @x l.1174
 void fatal(), overflow();
 @y
-void fatal P2H(char*,char*);
-void overflow(char*);
+void fatal (char*, char*);
+void overflow (char*);
 @z
 
 Section 64.
@@ -434,7 +434,7 @@ Section 64.
 fatal(s,t)
   char *s,*t;
 @y
-fatal P2C(char*,s, char*,t)
+fatal (char *s, char *t)
 @z
 
 Section 65.
@@ -443,7 +443,7 @@ Section 65.
 overflow(t)
   char *t;
 @y
-overflow P1C(char*,t)
+overflow (char *t)
 @z
 
 Section 67.
@@ -492,7 +492,7 @@ Section 69.
 @x l.1252
 void scan_args();
 @y
-void scan_args P1H(void);
+void scan_args (void);
 @z
 
 
@@ -501,7 +501,7 @@ Section 70.
 @x l.1257
 scan_args()
 @y
-scan_args P1H(void)
+scan_args (void)
 @z
 
 
diff --git a/Build/source/texk/web2c/cwebdir/ctang-w2c.ch b/Build/source/texk/web2c/cwebdir/ctang-w2c.ch
index 0e71a5d5f73..9e9bbe3b927 100644
--- a/Build/source/texk/web2c/cwebdir/ctang-w2c.ch
+++ b/Build/source/texk/web2c/cwebdir/ctang-w2c.ch
@@ -67,7 +67,7 @@ int main (ac, av)
 int ac;
 char **av;
 @y
-int main P2C(int,ac, char**,av)
+int main (int ac, char **av)
 @z
 
 @x l.100 - Add Web2C version to banner.
@@ -104,11 +104,11 @@ extern name_pointer section_lookup(); /* finds section name */
 extern void print_section_name(), sprint_section_name();
 @y
 /* looks up a string in the identifier table */
-extern name_pointer id_lookup P3H(char*,char*,char);
+extern name_pointer id_lookup (char*, char*, char);
 /* finds section name */
-extern name_pointer section_lookup P3H(char*,char*,char);
-extern void print_section_name P1H(name_pointer);
-extern void sprint_section_name P2H(char*,name_pointer);
+extern name_pointer section_lookup (char*, char*, char);
+extern void print_section_name (name_pointer);
+extern void sprint_section_name (char*, name_pointer);
 @z
 
 Section 10.
@@ -121,10 +121,10 @@ extern void fatal(); /* issue error message and die */
 extern void overflow(); /* succumb because a table has overflowed */
 @y
 extern int history; /* indicates how bad this run was */
-extern void err_print P1H(char*); /* print error message and context */
-extern int wrap_up P1H(void); /* indicate |history| and exit */
-extern void fatal P2H(char*,char*); /* issue error message and die */
-extern void overflow P1H(char*); /* succumb because a table has overflowed */
+extern void err_print (char*); /* print error message and context */
+extern int wrap_up (void); /* indicate |history| and exit */
+extern void fatal (char*, char*); /* issue error message and die */
+extern void overflow (char*); /* succumb because a table has overflowed */
 @z
 
 Section 11.
@@ -154,9 +154,9 @@ extern reset_input(); /* initialize to read the web file and change file */
 extern get_line(); /* inputs the next line */
 extern check_complete(); /* checks that all changes were picked up */
 @y
-extern void reset_input P1H(void); /* initialize to read the web file and change file */
-extern int get_line P1H(void); /* inputs the next line */
-extern void check_complete P1H(void); /* checks that all changes were picked up */
+extern void reset_input (void); /* initialize to read the web file and change file */
+extern int get_line (void); /* inputs the next line */
+extern void check_complete (void); /* checks that all changes were picked up */
 @z
 
 Section 15.
@@ -164,7 +164,7 @@ Section 15.
 @x common.h l.192
 extern void common_init();
 @y
-extern void common_init P1H(void);
+extern void common_init (void);
 @z
 
 Section 21.
@@ -175,7 +175,7 @@ name_pointer p; /* points to the proposed match */
 char *first; /* position of first character of string */
 int l; /* length of identifier */
 @y
-int names_match P4C(name_pointer,p, char*,first, int,l, char,t)
+int names_match (name_pointer p, char *first, int l, char t)
 @z
 
 Section 22.
@@ -184,13 +184,13 @@ Section 22.
 init_node(node)
 name_pointer node;
 @y
-init_node P1C(name_pointer,node)
+init_node (name_pointer node)
 @z
 
 @x l.207
 init_p() {}
 @y
-init_p P2C(name_pointer,p, char,t) {}
+init_p (name_pointer p, char t) {}
 @z
 
 Section 26.
@@ -199,7 +199,7 @@ Section 26.
 store_two_bytes(x)
 sixteen_bits x;
 @y
-store_two_bytes P1C(sixteen_bits,x)
+store_two_bytes (sixteen_bits x)
 @z
 
 Section 30.
@@ -208,7 +208,7 @@ Section 30.
 push_level(p) /* suspends the current level */
 name_pointer p;
 @y
-push_level P1C(name_pointer,p) /* suspends the current level */
+push_level (name_pointer p) /* suspends the current level */
 @z
 
 Section 31.
@@ -217,7 +217,7 @@ Section 31.
 pop_level(flag) /* do this when |cur_byte| reaches |cur_end| */
 int flag; /* |flag==0| means we are in |output_defs| */
 @y
-pop_level P1C(int,flag) /* do this when |cur_byte| reaches |cur_end| */
+pop_level (int flag) /* do this when |cur_byte| reaches |cur_end| */
 @z
 
 Section 33.
@@ -225,7 +225,7 @@ Section 33.
 @x l.393
 get_output() /* sends next token to |out_char| */
 @y
-get_output P1H(void) /* sends next token to |out_char| */
+get_output (void) /* sends next token to |out_char| */
 @z
 
 Section 37.
@@ -233,7 +233,7 @@ Section 37.
 @x l.483
 flush_buffer() /* writes one line to output file */
 @y
-flush_buffer P1H(void) /* writes one line to output file */
+flush_buffer (void) /* writes one line to output file */
 @z
 
 Section 41.
@@ -241,7 +241,7 @@ Section 41.
 @x l.534
 void phase_two();
 @y
-void phase_two P1H(void);
+void phase_two (void);
 @z
 
 Section 42.
@@ -249,7 +249,7 @@ Section 42.
 @x l.538
 phase_two () {
 @y
-phase_two P1H(void) {
+phase_two (void) {
 @z
 
 Section 46.
@@ -257,7 +257,7 @@ Section 46.
 @x l.603
 void output_defs();
 @y
-void output_defs P1H(void);
+void output_defs (void);
 @z
 
 Section 47.
@@ -265,7 +265,7 @@ Section 47.
 @x l.607
 output_defs()
 @y
-output_defs P1H(void)
+output_defs (void)
 @z
 
 Section 48.
@@ -273,7 +273,7 @@ Section 48.
 @x l.649
 static void out_char();
 @y
-static void out_char P1H(eight_bits);
+static void out_char (eight_bits);
 @z
 
 Section 49.
@@ -282,7 +282,7 @@ Section 49.
 out_char(cur_char)
 eight_bits cur_char;
 @y
-out_char P1C(eight_bits,cur_char)
+out_char (eight_bits cur_char)
 @z
 
 Section 58.
@@ -290,7 +290,7 @@ Section 58.
 @x l.815
 skip_ahead() /* skip to next control code */
 @y
-skip_ahead P1H(void) /* skip to next control code */
+skip_ahead (void) /* skip to next control code */
 @z
 
 Section 60.
@@ -299,7 +299,7 @@ Section 60.
 int skip_comment(is_long_comment) /* skips over comments */
 boolean is_long_comment;
 @y
-int skip_comment P1C(boolean,is_long_comment) /* skips over comments */
+int skip_comment (boolean is_long_comment) /* skips over comments */
 @z
 
 Section 62
@@ -314,7 +314,7 @@ Section 63.
 @x l.902
 get_next() /* produces the next input token */
 @y
-get_next P1H(void) /* produces the next input token */
+get_next (void) /* produces the next input token */
 @z
 
 Section 76.
@@ -323,7 +323,7 @@ Section 76.
 scan_repl(t) /* creates a replacement text */
 eight_bits t;
 @y
-scan_repl P1C(eight_bits,t) /* creates a replacement text */
+scan_repl (eight_bits t) /* creates a replacement text */
 @z
 
 Section 83.
@@ -331,7 +331,7 @@ Section 83.
 @x l.1359
 scan_section()
 @y
-scan_section P1H(void)
+scan_section (void)
 @z
 
 Section 90.
@@ -339,7 +339,7 @@ Section 90.
 @x l.1458
 void phase_one();
 @y
-void phase_one P1H(void);
+void phase_one (void);
 @z
 
 Section 91.
@@ -347,7 +347,7 @@ Section 91.
 @x l.1462
 phase_one() {
 @y
-phase_one P1H(void) {
+phase_one (void) {
 @z
 
 Section 92.
@@ -355,7 +355,7 @@ Section 92.
 @x l.1476
 void skip_limbo();
 @y
-void skip_limbo P1H(void);
+void skip_limbo (void);
 @z
 
 Section 93.
@@ -363,7 +363,7 @@ Section 93.
 @x l.1480
 skip_limbo()
 @y
-skip_limbo P1H(void)
+skip_limbo (void)
 @z
 
 Section 95.
@@ -371,5 +371,5 @@ Section 95.
 @x l.1535
 print_stats() {
 @y
-print_stats P1H(void) {
+print_stats (void) {
 @z
diff --git a/Build/source/texk/web2c/cwebdir/cweav-w2c.ch b/Build/source/texk/web2c/cwebdir/cweav-w2c.ch
index 59552eedcda..4d74596a0a1 100644
--- a/Build/source/texk/web2c/cwebdir/cweav-w2c.ch
+++ b/Build/source/texk/web2c/cwebdir/cweav-w2c.ch
@@ -72,7 +72,7 @@ int main (ac, av)
 int ac; /* argument count */
 char **av; /* argument values */
 @y
-int main P2C(int,ac, char**,av)
+int main (int ac, char **av)
 @z
 
 @x l.107 - Add Web2C version to banner.
@@ -110,11 +110,11 @@ extern name_pointer section_lookup(); /* finds section name */
 extern void print_section_name(), sprint_section_name();
 @y
 /* looks up a string in the identifier table */
-extern name_pointer id_lookup P3H(char*,char*,char);
+extern name_pointer id_lookup (char*, char*, char);
 /* finds section name */
-extern name_pointer section_lookup P3H(char*,char*,char);
-extern void print_section_name P1H(name_pointer);
-extern void sprint_section_name P2H(char*,name_pointer);
+extern name_pointer section_lookup (char*, char*, char);
+extern void print_section_name (name_pointer);
+extern void sprint_section_name (char*, name_pointer);
 @z
 
 Section 10.
@@ -127,10 +127,10 @@ extern void fatal(); /* issue error message and die */
 extern void overflow(); /* succumb because a table has overflowed */
 @y
 extern int history; /* indicates how bad this run was */
-extern void err_print P1H(char*); /* print error message and context */
-extern int wrap_up P1H(void); /* indicate |history| and exit */
-extern void fatal P2H(char*,char*); /* issue error message and die */
-extern void overflow P1H(char*); /* succumb because a table has overflowed */
+extern void err_print (char*); /* print error message and context */
+extern int wrap_up (void); /* indicate |history| and exit */
+extern void fatal (char*, char*); /* issue error message and die */
+extern void overflow (char*); /* succumb because a table has overflowed */
 @z
 
 Section 11.
@@ -160,9 +160,9 @@ extern reset_input(); /* initialize to read the web file and change file */
 extern get_line(); /* inputs the next line */
 extern check_complete(); /* checks that all changes were picked up */
 @y
-extern void reset_input P1H(void); /* initialize to read the web file and change file */
-extern int get_line P1H(void); /* inputs the next line */
-extern void check_complete P1H(void); /* checks that all changes were picked up */
+extern void reset_input (void); /* initialize to read the web file and change file */
+extern int get_line (void); /* inputs the next line */
+extern void check_complete (void); /* checks that all changes were picked up */
 @z
 
 Section 15.
@@ -170,7 +170,7 @@ Section 15.
 @x common.h l.192
 extern void common_init();
 @y
-extern void common_init P1H(void);
+extern void common_init (void);
 @z
 
 Section 21.
@@ -179,7 +179,7 @@ Section 21.
 new_xref(p)
 name_pointer p;
 @y
-new_xref P1C(name_pointer,p)
+new_xref (name_pointer p)
 @z
 
 Section 22.
@@ -188,7 +188,7 @@ Section 22.
 new_section_xref(p)
 name_pointer p;
 @y
-new_section_xref P1C(name_pointer,p)
+new_section_xref (name_pointer p)
 @z
 
 Section 23.
@@ -197,7 +197,7 @@ Section 23.
 set_file_flag(p)
 name_pointer p;
 @y
-set_file_flag P1C(name_pointer,p)
+set_file_flag (name_pointer p)
 @z
 
 Section 27.
@@ -209,7 +209,7 @@ char *first; /* position of first character of string */
 int l; /* length of identifier */
 eight_bits t; /* desired ilk */
 @y
-int names_match P4C(name_pointer,p, char*,first, int,l, char,t)
+int names_match (name_pointer p, char *first, int l, char t)
 @z
 
 @x l.383
@@ -217,14 +217,14 @@ init_p(p,t)
 name_pointer p;
 eight_bits t;
 @y
-init_p P2C(name_pointer,p, char,t)
+init_p (name_pointer p, char t)
 @z
 
 @x l.391
 init_node(p)
 name_pointer p;
 @y
-init_node P1C(name_pointer,p)
+init_node (name_pointer p)
 @z
 
 Section 34.
@@ -232,7 +232,7 @@ Section 34.
 @x l.600
 void   skip_limbo();
 @y
-void   skip_limbo P1H(void);
+void   skip_limbo (void);
 @z
 
 Section 35.
@@ -240,7 +240,7 @@ Section 35.
 @x l.604
 skip_limbo() {
 @y
-skip_limbo P1H(void) {
+skip_limbo (void) {
 @z
 
 Section 36.
@@ -248,7 +248,7 @@ Section 36.
 @x l.626
 skip_TeX() /* skip past pure \TEX/ code */
 @y
-skip_TeX P1H(void) /* skip past pure \TEX/ code */
+skip_TeX (void) /* skip past pure \TEX/ code */
 @z
 
 Section 38.
@@ -263,7 +263,7 @@ Section 39.
 @x l.696
 eight_bits get_next();
 @y
-eight_bits get_next P1H(void);
+eight_bits get_next (void);
 @z
 
 Section 40.
@@ -271,7 +271,7 @@ Section 40.
 @x l.700
 get_next() /* produces the next input token */
 @y
-get_next P1H(void) /* produces the next input token */
+get_next (void) /* produces the next input token */
 @z
 
 Section 55.
@@ -279,7 +279,7 @@ Section 55.
 @x l.971
 void skip_restricted();
 @y
-void skip_restricted P1H(void);
+void skip_restricted (void);
 @z
 
 Section 56.
@@ -287,7 +287,7 @@ Section 56.
 @x l.975
 skip_restricted()
 @y
-skip_restricted P1H(void)
+skip_restricted (void)
 @z
 
 Section 59.
@@ -295,7 +295,7 @@ Section 59.
 @x l.1024
 void phase_one();
 @y
-void phase_one P1H(void);
+void phase_one (void);
 @z
 
 Section 60.
@@ -303,7 +303,7 @@ Section 60.
 @x l.1028
 phase_one() {
 @y
-phase_one P1H(void) {
+phase_one (void) {
 @z
 
 Section 62.
@@ -311,7 +311,7 @@ Section 62.
 @x l.1076
 void C_xref();
 @y
-void C_xref P1H(eight_bits);
+void C_xref (eight_bits);
 @z
 
 Section 63.
@@ -320,7 +320,7 @@ Section 63.
 C_xref( spec_ctrl ) /* makes cross-references for \CEE/ identifiers */
   eight_bits spec_ctrl;
 @y
-C_xref P1C(eight_bits,spec_ctrl) /* makes cross-references for \CEE/ identifiers */
+C_xref (eight_bits spec_ctrl) /* makes cross-references for \CEE/ identifiers */
 @z
 
 Section 64.
@@ -328,7 +328,7 @@ Section 64.
 @x l.1104
 void outer_xref();
 @y
-void outer_xref P1H(void);
+void outer_xref (void);
 @z
 
 Section 65.
@@ -336,7 +336,7 @@ Section 65.
 @x l.1108
 outer_xref() /* extension of |C_xref| */
 @y
-outer_xref P1H(void) /* extension of |C_xref| */
+outer_xref (void) /* extension of |C_xref| */
 @z
 
 Section 74.
@@ -344,7 +344,7 @@ Section 74.
 @x l.1266
 void section_check();
 @y
-void section_check P1H(name_pointer);
+void section_check (name_pointer);
 @z
 
 Section 75.
@@ -353,7 +353,7 @@ Section 75.
 section_check(p)
 name_pointer p; /* print anomalies in subtree |p| */
 @y
-section_check P1C(name_pointer,p) /* print anomalies in subtree |p| */
+section_check (name_pointer p) /* print anomalies in subtree |p| */
 @z
 
 Section 78.
@@ -363,7 +363,7 @@ flush_buffer(b,per_cent,carryover)
 char *b;  /* outputs from |out_buf+1| to |b|,where |b<=out_ptr| */
 boolean per_cent,carryover;
 @y
-flush_buffer P3C(char*,b, boolean,per_cent, boolean,carryover)
+flush_buffer (char *b, boolean per_cent, boolean carryover)
 @z
 
 Section 79.
@@ -371,7 +371,7 @@ Section 79.
 @x l.1352
 finish_line() /* do this at the end of a line */
 @y
-finish_line P1H(void) /* do this at the end of a line */
+finish_line (void) /* do this at the end of a line */
 @z
 
 Section 81.
@@ -380,7 +380,7 @@ Section 81.
 out_str(s) /* output characters from |s| to end of string */
 char *s;
 @y
-out_str P1C(char*,s) /* output characters from |s| to end of string */
+out_str (char *s) /* output characters from |s| to end of string */
 @z
 
 Section 83.
@@ -388,7 +388,7 @@ Section 83.
 @x l.1402
 void break_out();
 @y
-void break_out P1H(void);
+void break_out (void);
 @z
 
 Section 84.
@@ -396,7 +396,7 @@ Section 84.
 @x l.1406
 break_out() /* finds a way to break the output line */
 @y
-break_out P1H(void) /* finds a way to break the output line */
+break_out (void) /* finds a way to break the output line */
 @z
 
 Section 86.
@@ -405,7 +405,7 @@ Section 86.
 out_section(n)
 sixteen_bits n;
 @y
-out_section P1C(sixteen_bits,n)
+out_section (sixteen_bits n)
 @z
 
 Section 87.
@@ -415,7 +415,7 @@ out_name(p,quote_xalpha)
 name_pointer p;
 boolean quote_xalpha;
 @y
-out_name P2C(name_pointer,p, boolean,quote_xalpha)
+out_name (name_pointer p, boolean quote_xalpha)
 @z
 
 Section 88.
@@ -423,7 +423,7 @@ Section 88.
 @x l.1485
 copy_limbo()
 @y
-copy_limbo P1H(void)
+copy_limbo (void)
 @z
 
 Section 90.
@@ -431,7 +431,7 @@ Section 90.
 @x l.1520
 copy_TeX()
 @y
-copy_TeX P1H(void)
+copy_TeX (void)
 @z
 
 Section 91.
@@ -439,7 +439,7 @@ Section 91.
 @x l.1449
 int copy_comment();
 @y
-int copy_comment P2H(boolean,int);
+int copy_comment (boolean, int);
 @z
 
 Section 92.
@@ -449,7 +449,7 @@ int copy_comment(is_long_comment,bal) /* copies \TEX/ code in comments */
 boolean is_long_comment; /* is this a traditional \CEE/ comment? */
 int bal; /* brace balance */
 @y
-int copy_comment P2C(boolean,is_long_comment, int,bal)
+int copy_comment (boolean is_long_comment, int bal)
 @z
 
 Section 99.
@@ -458,7 +458,7 @@ Section 99.
 print_cat(c) /* symbolic printout of a category */
 eight_bits c;
 @y
-print_cat P1C(eight_bits,c)
+print_cat (eight_bits c)
 @z
 
 Section 106.
@@ -467,7 +467,7 @@ Section 106.
 print_text(p) /* prints a token list for debugging; not used in |main| */
 text_pointer p;
 @y
-print_text P1C(text_pointer,p)
+print_text (text_pointer p)
 @z
 
 Section 109.
@@ -476,21 +476,21 @@ Section 109.
 app_str(s)
 char *s;
 @y
-app_str P1C(char*,s)
+app_str (char *s)
 @z
 
 @x l.2271
 big_app(a)
 token a;
 @y
-big_app P1C(token,a)
+big_app (token a)
 @z
 
 @x l.2288
 big_app1(a)
 scrap_pointer a;
 @y
-big_app1 P1C(scrap_pointer,a)
+big_app1 (scrap_pointer a)
 @z
 
 Section 111.
@@ -499,7 +499,7 @@ Section 111.
 find_first_ident(p)
 text_pointer p;
 @y
-find_first_ident P1C(text_pointer,p)
+find_first_ident (text_pointer p)
 @z
 
 Section 112.
@@ -508,7 +508,7 @@ Section 112.
 make_reserved(p) /* make the first identifier in |p->trans| like |int| */
 scrap_pointer p;
 @y
-make_reserved P1C(scrap_pointer,p)
+make_reserved (scrap_pointer p)
 @z
 
 Section 113.
@@ -518,7 +518,7 @@ make_underlined(p)
 /* underline the entry for the first identifier in |p->trans| */
 scrap_pointer p;
 @y
-make_underlined P1C(scrap_pointer,p)
+make_underlined (scrap_pointer p)
 @z
 
 Section 114.
@@ -526,7 +526,7 @@ Section 114.
 @x l.2495
 void  underline_xref();
 @y
-void  underline_xref P1H(name_pointer);
+void  underline_xref (name_pointer);
 @z
 
 Section 115.
@@ -535,7 +535,7 @@ Section 115.
 underline_xref(p)
 name_pointer p;
 @y
-underline_xref P1C(name_pointer,p)
+underline_xref (name_pointer p)
 @z
 
 Section 164.
@@ -546,7 +546,7 @@ scrap_pointer j;
 eight_bits c;
 short k, d, n;
 @y
-reduce P5C(scrap_pointer,j, short,k, eight_bits,c, short,d, short,n)
+reduce (scrap_pointer j, short k, eight_bits c, short d, short n)
 @z
 
 Section 165.
@@ -557,7 +557,7 @@ scrap_pointer j;
 eight_bits c;
 short k, d, n;
 @y
-squash P5C(scrap_pointer,j, short,k, eight_bits,c, short,d, short,n)
+squash (scrap_pointer j, short k, eight_bits c, short d, short n)
 @z
 
 Section 170.
@@ -565,7 +565,7 @@ Section 170.
 @x l.3126
 translate() /* converts a sequence of scraps */
 @y
-translate P1H(void) /* converts a sequence of scraps */
+translate (void) /* converts a sequence of scraps */
 @z
 
 Section 174.
@@ -574,7 +574,7 @@ Section 174.
 C_parse(spec_ctrl) /* creates scraps from \CEE/ tokens */
   eight_bits spec_ctrl;
 @y
-C_parse P1C(eight_bits,spec_ctrl) /* creates scraps from \CEE/ tokens */
+C_parse (eight_bits spec_ctrl) /* creates scraps from \CEE/ tokens */
 @z
 
 Section 181.
@@ -582,7 +582,7 @@ Section 181.
 @x l.3421
 void app_cur_id();
 @y
-void app_cur_id P1H(boolean);
+void app_cur_id (boolean);
 @z
 
 Section 182.
@@ -591,7 +591,7 @@ Section 182.
 app_cur_id(scrapping)
 boolean scrapping; /* are we making this into a scrap? */
 @y
-app_cur_id P1C(boolean,scrapping)
+app_cur_id (boolean scrapping)
 @z
 
 Section 183.
@@ -599,7 +599,7 @@ Section 183.
 @x l.3451
 C_translate()
 @y
-C_translate P1H(void)
+C_translate (void)
 @z
 
 Section 184.
@@ -607,7 +607,7 @@ Section 184.
 @x l.3480
 outer_parse() /* makes scraps from \CEE/ tokens and comments */
 @y
-outer_parse P1H(void) /* makes scraps from \CEE/ tokens and comments */
+outer_parse (void) /* makes scraps from \CEE/ tokens and comments */
 @z
 
 Section 189.
@@ -616,7 +616,7 @@ Section 189.
 push_level(p) /* suspends the current level */
 text_pointer p;
 @y
-push_level P1C(text_pointer,p) /* suspends the current level */
+push_level (text_pointer p) /* suspends the current level */
 @z
 
 Section 190.
@@ -624,7 +624,7 @@ Section 190.
 @x l.3606
 pop_level()
 @y
-pop_level P1H(void)
+pop_level (void)
 @z
 
 Section 192.
@@ -632,7 +632,7 @@ Section 192.
 @x l.3628
 get_output() /* returns the next token of output */
 @y
-get_output P1H(void) /* returns the next token of output */
+get_output (void) /* returns the next token of output */
 @z
 
 Section 193.
@@ -640,7 +640,7 @@ Section 193.
 @x l.3665
 output_C() /* outputs the current token list */
 @y
-output_C P1H(void) /* outputs the current token list */
+output_C (void) /* outputs the current token list */
 @z
 
 Section 194.
@@ -648,7 +648,7 @@ Section 194.
 @x l.3687
 void make_output();
 @y
-void make_output P1H(void);
+void make_output (void);
 @z
 
 Section 195.
@@ -656,7 +656,7 @@ Section 195.
 @x l.3691
 make_output() /* outputs the equivalents of tokens */
 @y
-make_output P1H(void) /* outputs the equivalents of tokens */
+make_output (void) /* outputs the equivalents of tokens */
 @z
 
 Section 205.
@@ -664,7 +664,7 @@ Section 205.
 @x l.3951
 void phase_two();
 @y
-void phase_two P1H(void);
+void phase_two (void);
 @z
 
 Section 206.
@@ -672,7 +672,7 @@ Section 206.
 @x l.3955
 phase_two() {
 @y
-phase_two P1H(void) {
+phase_two (void) {
 @z
 
 Section 212.
@@ -680,7 +680,7 @@ Section 212.
 @x l.4074
 void finish_C();
 @y
-void finish_C P1H(boolean);
+void finish_C (boolean);
 @z
 
 Section 213.
@@ -689,7 +689,7 @@ Section 213.
 finish_C(visible) /* finishes a definition or a \CEE/ part */
   boolean visible; /* nonzero if we should produce \TEX/ output */
 @y
-finish_C P1C(boolean,visible) /* finishes a definition or a \CEE/ part */
+finish_C (boolean visible) /* finishes a definition or a \CEE/ part */
 @z
 
 Section 221.
@@ -697,7 +697,7 @@ Section 221.
 @x l.4245
 void footnote();
 @y
-void footnote P1H(sixteen_bits);
+void footnote (sixteen_bits);
 @z
 
 Section 222.
@@ -706,7 +706,7 @@ Section 222.
 footnote(flag) /* outputs section cross-references */
 sixteen_bits flag;
 @y
-footnote P1C(sixteen_bits,flag) /* outputs section cross-references */
+footnote (sixteen_bits flag) /* outputs section cross-references */
 @z
 
 Section 225.
@@ -714,7 +714,7 @@ Section 225.
 @x l.4294
 void phase_three();
 @y
-void phase_three P1H(void);
+void phase_three (void);
 @z
 
 Section 226.
@@ -722,7 +722,7 @@ Section 226.
 @x l.4298
 phase_three() {
 @y
-phase_three P1H(void) {
+phase_three (void) {
 @z
 
 Section 237.
@@ -730,7 +730,7 @@ Section 237.
 @x l.4474
 void  unbucket();
 @y
-void  unbucket P1H(eight_bits);
+void  unbucket (eight_bits);
 @z
 
 Section 238.
@@ -739,7 +739,7 @@ Section 238.
 unbucket(d) /* empties buckets having depth |d| */
 eight_bits d;
 @y
-unbucket P1C(eight_bits,d) /* empties buckets having depth |d| */
+unbucket (eight_bits d) /* empties buckets having depth |d| */
 @z
 
 Section 246.
@@ -747,7 +747,7 @@ Section 246.
 @x l.4594
 void section_print();
 @y
-void section_print P1H(name_pointer);
+void section_print (name_pointer);
 @z
 
 Section 247.
@@ -756,7 +756,7 @@ Section 247.
 section_print(p) /* print all section names in subtree |p| */
 name_pointer p;
 @y
-section_print P1C(name_pointer,p) /* print all section names in subtree |p| */
+section_print (name_pointer p) /* print all section names in subtree |p| */
 @z
 
 Section 249.
@@ -764,5 +764,5 @@ Section 249.
 @x l.4620
 print_stats() {
 @y
-print_stats P1H(void) {
+print_stats (void) {
 @z
diff --git a/Build/source/texk/web2c/tiedir/ChangeLog b/Build/source/texk/web2c/tiedir/ChangeLog
index b15b32cac5f..39e87c078c6 100644
--- a/Build/source/texk/web2c/tiedir/ChangeLog
+++ b/Build/source/texk/web2c/tiedir/ChangeLog
@@ -1,3 +1,7 @@
+2009-06-23  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* tie-w2c.ch: drop P?C, P?H, use ANSI C function declarations.
+
 2009-03-07  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	* tie-w2c.ch, tie.w: remove trailing whitespace.
diff --git a/Build/source/texk/web2c/tiedir/tie-w2c.ch b/Build/source/texk/web2c/tiedir/tie-w2c.ch
index 55c5a64c624..4c3d0f61f09 100644
--- a/Build/source/texk/web2c/tiedir/tie-w2c.ch
+++ b/Build/source/texk/web2c/tiedir/tie-w2c.ch
@@ -42,14 +42,14 @@ typedef char* string;
 void get_line(i)
 	file_index i;
 @y
-void get_line P1C(file_index, i)
+void get_line (file_index i)
 @z
 
 @x
 void err_loc(i) /* prints location of error */
         int i;
 @y
-void err_loc P1C(int, i) /* prints location of error */
+void err_loc (int i) /* prints location of error */
 @z
 
 @x
@@ -68,48 +68,48 @@ void err_loc P1C(int, i) /* prints location of error */
 boolean lines_dont_match(i,j)
 	file_index i,j;
 @y
-boolean lines_dont_match P2C(file_index, i, file_index, j)
+boolean lines_dont_match (file_index i, file_index j)
 @z
 
 @x
 void init_change_file(i,b)
 	file_index i; boolean b;
 @y
-void init_change_file P2C(file_index, i, boolean, b)
+void init_change_file (file_index i, boolean b)
 @z
 
 @x
 void put_line(j)
 	file_index j;
 @y
-void put_line P1C(file_index, j)
+void put_line (file_index j)
 @z
 
 @x
 boolean e_of_ch_module(i)
 	file_index i;
 @y
-boolean e_of_ch_module P1C(file_index, i)
+boolean e_of_ch_module (file_index i)
 @z
 
 @x
 boolean e_of_ch_preamble(i)
 	file_index i;
 @y
-boolean e_of_ch_preamble P1C(file_index, i)
+boolean e_of_ch_preamble (file_index i)
 @z
 
 @x
 void usage()
 @y
-void usage P1H(void)
+void usage (void)
 @z
 
 @x
 main(argc,argv)
         int argc; string *argv;
 @y
-int main P2C(int, argc, string *, argv)
+int main (int argc, string *argv)
 @z
 
 @x