summaryrefslogtreecommitdiff
path: root/Build/source/texk/web2c/lib
diff options
context:
space:
mode:
Diffstat (limited to 'Build/source/texk/web2c/lib')
-rw-r--r--Build/source/texk/web2c/lib/ChangeLog7
-rw-r--r--Build/source/texk/web2c/lib/basechsuffix.c4
-rw-r--r--Build/source/texk/web2c/lib/chartostring.c2
-rw-r--r--Build/source/texk/web2c/lib/coredump.c2
-rw-r--r--Build/source/texk/web2c/lib/eofeoln.c6
-rw-r--r--Build/source/texk/web2c/lib/fprintreal.c2
-rw-r--r--Build/source/texk/web2c/lib/input2int.c4
-rw-r--r--Build/source/texk/web2c/lib/inputint.c2
-rw-r--r--Build/source/texk/web2c/lib/main.c9
-rw-r--r--Build/source/texk/web2c/lib/openclose.c16
-rw-r--r--Build/source/texk/web2c/lib/printversion.c8
-rw-r--r--Build/source/texk/web2c/lib/texmfmp.c234
-rw-r--r--Build/source/texk/web2c/lib/uexit.c2
-rw-r--r--Build/source/texk/web2c/lib/usage.c4
-rw-r--r--Build/source/texk/web2c/lib/win32main.c6
-rw-r--r--Build/source/texk/web2c/lib/zround.c2
16 files changed, 158 insertions, 152 deletions
diff --git a/Build/source/texk/web2c/lib/ChangeLog b/Build/source/texk/web2c/lib/ChangeLog
index 256e7009e81..5a220838013 100644
--- a/Build/source/texk/web2c/lib/ChangeLog
+++ b/Build/source/texk/web2c/lib/ChangeLog
@@ -1,3 +1,10 @@
+2009-06-23 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * basechsuffix.c, chartostring.c, coredump.c, eofeoln.c,
+ fprintreal.c, input2int.c, inputint.c, main.c, openclose.c,
+ printversion.c, texmfmp.c, uexit.c, usage.c, win32main.c,
+ zround.c: drop P?C, P?H, use ANSI C function declarations.
+
2009-06-10 Peter Breitenlohner <peb@mppmu.mpg.de>
* Makefile.am (AM_CFLAGS): enable compiler warnings.
diff --git a/Build/source/texk/web2c/lib/basechsuffix.c b/Build/source/texk/web2c/lib/basechsuffix.c
index 28f269dd7d3..8ca0e7cb117 100644
--- a/Build/source/texk/web2c/lib/basechsuffix.c
+++ b/Build/source/texk/web2c/lib/basechsuffix.c
@@ -13,8 +13,8 @@
In other words, we're implementing `basename NAME OLD`NEW. */
string
-basenamechangesuffix P3C(const_string, name, const_string, old_suffix,
- const_string, new_suffix)
+basenamechangesuffix (const_string name, const_string old_suffix,
+ const_string new_suffix)
{
string answer;
unsigned c;
diff --git a/Build/source/texk/web2c/lib/chartostring.c b/Build/source/texk/web2c/lib/chartostring.c
index ece5fe5e2f3..bd4253022cd 100644
--- a/Build/source/texk/web2c/lib/chartostring.c
+++ b/Build/source/texk/web2c/lib/chartostring.c
@@ -14,7 +14,7 @@ Written in 1994 by Karl Berry. Public domain. */
malloc overhead) here, but it doesn't matter. */
string
-chartostring P1C(char, ch)
+chartostring (char ch)
{
string str = (string)xmalloc (2);
str[0] = ch;
diff --git a/Build/source/texk/web2c/lib/coredump.c b/Build/source/texk/web2c/lib/coredump.c
index b465969294c..c89d6732931 100644
--- a/Build/source/texk/web2c/lib/coredump.c
+++ b/Build/source/texk/web2c/lib/coredump.c
@@ -17,7 +17,7 @@
#include <sys/wait.h>
void
-funny_core_dump P1H(void)
+funny_core_dump (void)
{
#ifdef __EMX__
{
diff --git a/Build/source/texk/web2c/lib/eofeoln.c b/Build/source/texk/web2c/lib/eofeoln.c
index 6e1225575be..c584f5da138 100644
--- a/Build/source/texk/web2c/lib/eofeoln.c
+++ b/Build/source/texk/web2c/lib/eofeoln.c
@@ -8,7 +8,7 @@
Pascal's `eof' builtin. */
boolean
-eof P1C(FILE *, file)
+eof (FILE *file)
{
register int c;
@@ -36,7 +36,7 @@ eof P1C(FILE *, file)
/* Accept both CR and LF as end-of-line. */
boolean
-eoln P1C(FILE*, file)
+eoln (FILE *file)
{
register int c;
@@ -55,7 +55,7 @@ eoln P1C(FILE*, file)
/* Handle CRLF as a single end-of-line. */
void
-readln P1C(FILE*, f)
+readln (FILE *f)
{
int c;
while ((c = getc (f)) != '\n' && c != '\r' && c != EOF)
diff --git a/Build/source/texk/web2c/lib/fprintreal.c b/Build/source/texk/web2c/lib/fprintreal.c
index e30261b9520..27424b3d470 100644
--- a/Build/source/texk/web2c/lib/fprintreal.c
+++ b/Build/source/texk/web2c/lib/fprintreal.c
@@ -5,7 +5,7 @@
#include "lib.h"
void
-fprintreal P4C(FILE*, f, double, r, int, n, int, m)
+fprintreal (FILE *f, double r, int n, int m)
{
char fmt[50]; /* Surely enough, since N and M won't be more than 25
digits each! */
diff --git a/Build/source/texk/web2c/lib/input2int.c b/Build/source/texk/web2c/lib/input2int.c
index 6bed88bf9e2..792fa6791f8 100644
--- a/Build/source/texk/web2c/lib/input2int.c
+++ b/Build/source/texk/web2c/lib/input2int.c
@@ -15,7 +15,7 @@
/* Read two integers from stdin. */
void
-zinput2ints P2C(integer *, a, integer *, b)
+zinput2ints (integer *a, integer *b)
{
int ch;
@@ -33,7 +33,7 @@ zinput2ints P2C(integer *, a, integer *, b)
/* Read three integers from stdin. */
void
-zinput3ints P3C(integer *, a, integer *, b, integer *, c)
+zinput3ints (integer *a, integer *b, integer *c)
{
int ch;
diff --git a/Build/source/texk/web2c/lib/inputint.c b/Build/source/texk/web2c/lib/inputint.c
index 3082c8a112f..7b2dd58704d 100644
--- a/Build/source/texk/web2c/lib/inputint.c
+++ b/Build/source/texk/web2c/lib/inputint.c
@@ -9,7 +9,7 @@
line. */
integer
-inputint P1C(FILE *, f)
+inputint (FILE *f)
{
char buffer[MAX_INT_LENGTH]; /* Long enough for anything reasonable. */
diff --git a/Build/source/texk/web2c/lib/main.c b/Build/source/texk/web2c/lib/main.c
index 8341b979543..23af7a4fd12 100644
--- a/Build/source/texk/web2c/lib/main.c
+++ b/Build/source/texk/web2c/lib/main.c
@@ -8,17 +8,18 @@
char **argv;
int argc;
+extern void mainbody (void);
+
/* The entry point for all the programs except TeX and Metafont, which
have more to do. We just have to set up the command line. web2c
transforms Pascal's main block into a procedure `main_body'. */
-
-int main P2C(int, ac, string *, av)
+int
+main (int ac, string* av)
{
#ifdef __EMX__
_wildcard (&ac, &av);
_response (&ac, &av);
#endif
- extern void mainbody P1H(void);
argc = ac;
argv = av;
@@ -30,7 +31,7 @@ int main P2C(int, ac, string *, av)
/* Return the Nth (counted as in C) argument from the command line. */
string
-cmdline P1C(int, n)
+cmdline (int n)
{
if (n >= argc)
{ /* This error message should never happen, because the callers
diff --git a/Build/source/texk/web2c/lib/openclose.c b/Build/source/texk/web2c/lib/openclose.c
index 72ca0d890dd..dab1b4ff43c 100644
--- a/Build/source/texk/web2c/lib/openclose.c
+++ b/Build/source/texk/web2c/lib/openclose.c
@@ -35,7 +35,7 @@ int texinputtype;
/* Helpers for the filename recorder... */
/* Start the recorder */
static void
-recorder_start()
+recorder_start(void)
{
/* Alas, while we might want to use mkstemp it is not portable.
So we have to be content with using a default name... */
@@ -61,7 +61,7 @@ recorder_start()
/* Change the name of the recorder file. */
void
-recorder_change_filename P1C(string, new_name)
+recorder_change_filename (string new_name)
{
if (!recorder_file)
return;
@@ -72,7 +72,7 @@ recorder_change_filename P1C(string, new_name)
/* helper for recorder_record_* */
static void
-recorder_record_name P2C(string, prefix, const_string, nameoffile)
+recorder_record_name (string prefix, const_string nameoffile)
{
if (recorder_enabled) {
if (!recorder_file)
@@ -84,14 +84,14 @@ recorder_record_name P2C(string, prefix, const_string, nameoffile)
/* record an input file */
void
-recorder_record_input P1C(const_string, nameoffile)
+recorder_record_input (const_string nameoffile)
{
recorder_record_name ("INPUT", nameoffile);
}
/* record an output file */
void
-recorder_record_output P1C(const_string, nameoffile)
+recorder_record_output (const_string nameoffile)
{
recorder_record_name ("OUTPUT", nameoffile);
}
@@ -102,7 +102,7 @@ recorder_record_output P1C(const_string, nameoffile)
the full filename opened, and `namelength' to its length. */
boolean
-open_input P3C(FILE **, f_ptr, int, filefmt, const_string, fopen_mode)
+open_input (FILE **f_ptr, int filefmt, const_string fopen_mode)
{
string fname = NULL;
#ifdef FUNNY_CORE_DUMP
@@ -221,7 +221,7 @@ open_input P3C(FILE **, f_ptr, int, filefmt, const_string, fopen_mode)
necessary, and `namelength' to its length. */
boolean
-open_output P2C(FILE **, f_ptr, const_string, fopen_mode)
+open_output (FILE **f_ptr, const_string fopen_mode)
{
string fname;
boolean absolute = kpse_absolute_p(nameoffile+1, false);
@@ -263,7 +263,7 @@ open_output P2C(FILE **, f_ptr, const_string, fopen_mode)
/* Close F. */
void
-close_file P1C(FILE *, f)
+close_file (FILE *f)
{
/* If F is null, just return. bad_pool might close a file that has
never been opened. */
diff --git a/Build/source/texk/web2c/lib/printversion.c b/Build/source/texk/web2c/lib/printversion.c
index f532c729d93..f181c52f107 100644
--- a/Build/source/texk/web2c/lib/printversion.c
+++ b/Build/source/texk/web2c/lib/printversion.c
@@ -17,10 +17,10 @@ This is PROGRAM, Version VERSION-NUMBER
program, but tangle doesn't allow multiline string constants ... */
void
-printversionandexit P4C(const_string, banner,
- const_string, copyright_holder,
- const_string, author,
- char*, extra_info)
+printversionandexit (const_string banner,
+ const_string copyright_holder,
+ const_string author,
+ char *extra_info)
{
extern string versionstring; /* from web2c/lib/version.c */
extern KPSEDLL string kpathsea_version_string;/* from kpathsea/version.c */
diff --git a/Build/source/texk/web2c/lib/texmfmp.c b/Build/source/texk/web2c/lib/texmfmp.c
index 2f3207b3c14..7e2e6c73abe 100644
--- a/Build/source/texk/web2c/lib/texmfmp.c
+++ b/Build/source/texk/web2c/lib/texmfmp.c
@@ -520,19 +520,19 @@ string default_translate_filename;
MAYBE_STATIC char *last_source_name;
static int last_lineno;
MAYBE_STATIC boolean srcspecialsoption = false;
-MAYBE_STATIC void parse_src_specials_option P1H(const_string);
+MAYBE_STATIC void parse_src_specials_option (const_string);
/* The main body of the WEB is transformed into this procedure. */
-extern TEXDLL void mainbody P1H(void);
+extern TEXDLL void mainbody (void);
/* Parsing a first %&-line in the input file. */
-static void parse_first_line P1H(const_string);
+static void parse_first_line (const_string);
/* Parse option flags. */
-static void parse_options P2H(int, string *);
+static void parse_options (int, string *);
/* Try to figure out if we have been given a filename. */
-static string get_input_file_name P1H(void);
+static string get_input_file_name (void);
#if defined(Aleph)
/* Declare this for Omega family, so they can parse the -8bit option,
@@ -581,7 +581,7 @@ texmf_yesno(const_string var)
happen in `topenin', then call the main body. */
void TEXDLL
-maininit P2C(int, ac, string *, av)
+maininit (int ac, string *av)
{
string main_input_file;
@@ -770,7 +770,7 @@ maininit P2C(int, ac, string *, av)
happen in `topenin', then call the main body. */
int
-main P2C(int, ac, string *, av)
+main (int ac, string *av)
{
#ifdef __EMX__
_wildcard (&ac, &av);
@@ -802,7 +802,7 @@ main P2C(int, ac, string *, av)
`last=first'. */
void
-topenin P1H(void)
+topenin (void)
{
int i;
@@ -914,7 +914,7 @@ static struct sockaddr *ipc_addr;
static int ipc_addr_len;
static int
-ipc_make_name P1H(void)
+ipc_make_name (void)
{
if (ipc_addr_len == 0) {
string s = getenv ("HOME");
@@ -934,14 +934,14 @@ ipc_make_name P1H(void)
static int sock = -1;
static int
-ipc_is_open P1H(void)
+ipc_is_open (void)
{
return sock >= 0;
}
static void
-ipc_open_out P1H(void) {
+ipc_open_out (void) {
#ifdef IPC_DEBUG
fputs ("tex: Opening socket for IPC output ...\n", stderr);
#endif
@@ -970,7 +970,7 @@ ipc_open_out P1H(void) {
static void
-ipc_close_out P1H(void)
+ipc_close_out (void)
{
#ifdef IPC_DEBUG
fputs ("tex: Closing output socket ...\n", stderr);
@@ -983,7 +983,7 @@ ipc_close_out P1H(void)
static void
-ipc_snd P3C(int, n, int, is_eof, char *, data)
+ipc_snd (int n, int is_eof, char *data)
{
struct
{
@@ -1022,7 +1022,7 @@ ipc_snd P3C(int, n, int, is_eof, char *, data)
too_big_char = biggest_char + 1 = 65536 (omstr.ch).*/
void
-ipcpage P1C(int, is_eof)
+ipcpage (int is_eof)
{
static boolean begun = false;
unsigned len = 0;
@@ -1076,10 +1076,10 @@ ipcpage P1C(int, is_eof)
can be parsed. */
static int
-tcx_get_num P4C(int, upb,
- unsigned, line_count,
- string, start,
- string *, post)
+tcx_get_num (int upb,
+ unsigned line_count,
+ string start,
+ string *post)
{
int num = strtol (start, post, 0);
assert (post && *post);
@@ -1110,7 +1110,7 @@ tcx_get_num P4C(int, upb,
/* FIXME: A new format ought to be introduced for these files. */
void
-readtcxfile P1H(void)
+readtcxfile (void)
{
string orig_filename;
if (!find_suffix (translate_filename)) {
@@ -1175,7 +1175,7 @@ readtcxfile P1H(void)
#ifdef XeTeX /* XeTeX handles this differently, and allows odd quotes within names */
string
-normalize_quotes P2C(const_string, name, const_string, mesg)
+normalize_quotes (const_string name, const_string mesg)
{
int quote_char = 0;
boolean must_quote = (strchr(name, ' ') != NULL);
@@ -1222,7 +1222,7 @@ normalize_quotes P2C(const_string, name, const_string, mesg)
/* Normalize quoting of filename -- that is, only quote if there is a space,
and always use the quote-name-quote style. */
string
-normalize_quotes P2C(const_string, name, const_string, mesg)
+normalize_quotes (const_string name, const_string mesg)
{
boolean quoted = false;
boolean must_quote = (strchr(name, ' ') != NULL);
@@ -1252,7 +1252,7 @@ normalize_quotes P2C(const_string, name, const_string, mesg)
/* Getting the input filename. */
string
-get_input_file_name P1H(void)
+get_input_file_name (void)
{
string input_file_name = NULL;
@@ -1364,7 +1364,7 @@ static struct option long_options[]
static void
-parse_options P2C(int, argc, string *, argv)
+parse_options (int argc, string *argv)
{
int g; /* `getopt' return code. */
int option_index;
@@ -1533,7 +1533,7 @@ parse_options P2C(int, argc, string *, argv)
#if defined(TeX)
#if ! defined (luaTeX)
void
-parse_src_specials_option P1C(const_string, opt_list)
+parse_src_specials_option (const_string opt_list)
{
char * toklist = xstrdup(opt_list);
char * tok;
@@ -1591,7 +1591,7 @@ parse_src_specials_option P1C(const_string, opt_list)
Also call kpse_reset_program_name to ensure the correct paths for the
format are used. */
static void
-parse_first_line P1C(const_string, filename)
+parse_first_line (const_string filename)
{
FILE *f = filename ? fopen (filename, FOPEN_R_MODE) : NULL;
if (f) {
@@ -1676,8 +1676,8 @@ static const_string ok_type_name[] = {
};
static boolean
-opennameok P4C(const_string, fname, const_string, check_var,
- const_string, default_choice, ok_type, action)
+opennameok (const_string fname, const_string check_var,
+ const_string default_choice, ok_type action)
{
/* We distinguish three cases:
'a' (any) allows any file to be opened.
@@ -1760,13 +1760,13 @@ opennameok P4C(const_string, fname, const_string, check_var,
return true;
}
-boolean openinnameok P1C(const_string, fname)
+boolean openinnameok (const_string fname)
{
/* For input default to all. */
return opennameok (fname, "openin_any", "a", ok_reading);
}
-boolean openoutnameok P1C(const_string, fname)
+boolean openoutnameok (const_string fname)
{
/* For output, default to paranoid. */
return opennameok (fname, "openout_any", "p", ok_writing);
@@ -1786,7 +1786,7 @@ static FILE *pipes [] = {NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,
NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL};
boolean
-open_in_or_pipe P3C(FILE **, f_ptr, int, filefmt, const_string, fopen_mode)
+open_in_or_pipe (FILE **f_ptr, int filefmt, const_string fopen_mode)
{
string fname = NULL;
int i; /* iterator */
@@ -1825,7 +1825,7 @@ open_in_or_pipe P3C(FILE **, f_ptr, int, filefmt, const_string, fopen_mode)
boolean
-open_out_or_pipe P2C(FILE **, f_ptr, const_string, fopen_mode)
+open_out_or_pipe (FILE **f_ptr, const_string fopen_mode)
{
string fname;
int i; /* iterator */
@@ -1871,7 +1871,7 @@ open_out_or_pipe P2C(FILE **, f_ptr, const_string, fopen_mode)
void
-close_file_or_pipe P1C(FILE *, f)
+close_file_or_pipe (FILE *f)
{
int i; /* iterator */
@@ -1909,7 +1909,7 @@ catch_interrupt (DWORD arg)
}
#else /* not WIN32 */
static RETSIGTYPE
-catch_interrupt P1C (int, arg)
+catch_interrupt (int arg)
{
interrupt = 1;
#ifdef OS2
@@ -1927,8 +1927,8 @@ catch_interrupt P1C (int, arg)
good a place as any. */
void
-get_date_and_time P4C(integer *, minutes, integer *, day,
- integer *, month, integer *, year)
+get_date_and_time (integer *minutes, integer *day,
+ integer *month, integer *year)
{
time_t myclock = time ((time_t *) 0);
struct tm *tmptr = localtime (&myclock);
@@ -1959,7 +1959,7 @@ get_date_and_time P4C(integer *, minutes, integer *, day,
#ifdef WIN32
SetConsoleCtrlHandler(catch_interrupt, TRUE);
#else /* not WIN32 */
- RETSIGTYPE (*old_handler) P1H(int);
+ RETSIGTYPE (*old_handler) (int);
old_handler = signal (SIGINT, catch_interrupt);
if (old_handler != SIG_DFL)
@@ -1973,7 +1973,7 @@ get_date_and_time P4C(integer *, minutes, integer *, day,
Getting a high resolution time.
*/
void
-get_seconds_and_micros P2C(integer *, seconds, integer *, micros)
+get_seconds_and_micros (integer *seconds, integer *micros)
{
#if defined (HAVE_GETTIMEOFDAY)
struct timeval tv;
@@ -2020,7 +2020,7 @@ getrandomseed()
#ifndef XeTeX /* for XeTeX, we have a replacement function in XeTeX_ext.c */
boolean
-input_line P1C(FILE *, f)
+input_line (FILE *f)
{
int i = EOF;
@@ -2076,10 +2076,10 @@ static const_string edit_value = EDITOR;
actual filename starts; FNLENGTH is how long the filename is. */
void
-calledit P4C(packedASCIIcode *, filename,
- poolpointer, fnstart,
- integer, fnlength,
- integer, linenumber)
+calledit (packedASCIIcode *filename,
+ poolpointer fnstart,
+ integer fnlength,
+ integer linenumber)
{
char *temp, *command;
char c;
@@ -2184,7 +2184,7 @@ calledit P4C(packedASCIIcode *, filename,
opposite-endianness of whatever they are now. */
static void
-swap_items P3C(char *, p, int, nitems, int, size)
+swap_items (char *p, int nitems, int size)
{
char temp;
@@ -2254,9 +2254,9 @@ swap_items P3C(char *, p, int, nitems, int, size)
void
#ifdef XeTeX
-do_dump P4C(char *, p, int, item_size, int, nitems, gzFile, out_file)
+do_dump (char *p, int item_size, int nitems, gzFile out_file)
#else
-do_dump P4C(char *, p, int, item_size, int, nitems, FILE *, out_file)
+do_dump (char *p, int item_size, int nitems, FILE *out_file)
#endif
{
#if !defined (WORDS_BIGENDIAN) && !defined (NO_DUMP_SHARE)
@@ -2286,9 +2286,9 @@ do_dump P4C(char *, p, int, item_size, int, nitems, FILE *, out_file)
void
#ifdef XeTeX
-do_undump P4C(char *, p, int, item_size, int, nitems, gzFile, in_file)
+do_undump (char *p, int item_size, int nitems, gzFile in_file)
#else
-do_undump P4C(char *, p, int, item_size, int, nitems, FILE *, in_file)
+do_undump (char *p, int item_size, int nitems, FILE *in_file)
#endif
{
#ifdef XeTeX
@@ -2307,7 +2307,7 @@ do_undump P4C(char *, p, int, item_size, int, nitems, FILE *, in_file)
DFLT to *VAR. */
void
-setupboundvariable P3C(integer *, var, const_string, var_name, integer, dflt)
+setupboundvariable (integer *var, const_string var_name, integer dflt)
{
string expansion = kpse_var_value (var_name);
*var = dflt;
@@ -2404,7 +2404,7 @@ getjobname(strnumber name)
#if defined(TeX)
int
-compare_paths P2C(const_string, p1, const_string, p2)
+compare_paths (const_string p1, const_string p2)
{
int ret;
while (
@@ -2423,7 +2423,7 @@ compare_paths P2C(const_string, p1, const_string, p2)
#ifdef XeTeX /* the string pool is UTF-16 but we want a UTF-8 string */
string
-gettexstring P1C(strnumber, s)
+gettexstring (strnumber s)
{
unsigned bytesToWrite = 0;
poolpointer len, i, j;
@@ -2468,7 +2468,7 @@ gettexstring P1C(strnumber, s)
#else
string
-gettexstring P1C(strnumber, s)
+gettexstring (strnumber s)
{
poolpointer len;
string name;
@@ -2494,15 +2494,14 @@ gettexstring P1C(strnumber, s)
#endif /* not XeTeX */
boolean
-isnewsource P2C(strnumber, srcfilename, int, lineno)
+isnewsource (strnumber srcfilename, int lineno)
{
char *name = gettexstring(srcfilename);
return (compare_paths(name, last_source_name) != 0 || lineno != last_lineno);
}
void
-remembersourceinfo P2C(strnumber, srcfilename,
- int, lineno)
+remembersourceinfo (strnumber srcfilename, int lineno)
{
if (last_source_name)
free(last_source_name);
@@ -2511,8 +2510,7 @@ remembersourceinfo P2C(strnumber, srcfilename,
}
poolpointer
-makesrcspecial P2C(strnumber, srcfilename,
- int, lineno)
+makesrcspecial (strnumber srcfilename, int lineno)
{
poolpointer oldpoolptr = poolptr;
char *filename = gettexstring(srcfilename);
@@ -2613,7 +2611,7 @@ connection with the use or performance of this software.
#define TWEXP_28 (1.0/268435456.0)
integer
-ztakefraction P2C(integer, p, integer, q) /* Approximate p*q/2^28 */
+ztakefraction (integer p, integer q) /* Approximate p*q/2^28 */
{ register double d;
register integer i;
d = (double)p * (double)q * TWEXP_28;
@@ -2640,7 +2638,7 @@ ztakefraction P2C(integer, p, integer, q) /* Approximate p*q/2^28 */
}
integer
-ztakescaled P2C(integer, p, integer, q) /* Approximate p*q/2^16 */
+ztakescaled (integer p, integer q) /* Approximate p*q/2^16 */
{ register double d;
register integer i;
d = (double)p * (double)q * TWEXP_16;
@@ -2671,7 +2669,7 @@ ztakescaled P2C(integer, p, integer, q) /* Approximate p*q/2^16 */
and 8/1. No pair of integers less than 2^31 has such a ratio.
*/
integer
-zmakefraction P2C(integer, p, integer, q) /* Approximate 2^28*p/q */
+zmakefraction (integer p, integer q) /* Approximate 2^28*p/q */
{ register double d;
register integer i;
#ifdef DEBUG
@@ -2699,7 +2697,7 @@ zmakefraction P2C(integer, p, integer, q) /* Approximate 2^28*p/q */
and 2^15/1. No pair of integers less than 2^31 has such a ratio.
*/
integer
-zmakescaled P2C(integer, p, integer, q) /* Approximate 2^16*p/q */
+zmakescaled (integer p, integer q) /* Approximate 2^16*p/q */
{ register double d;
register integer i;
#ifdef DEBUG
@@ -2747,75 +2745,75 @@ zmakescaled P2C(integer, p, integer, q) /* Approximate 2^16*p/q */
#endif
#ifdef AMIGAWIN
-extern int mf_amiga_initscreen P1H(void);
-extern void mf_amiga_updatescreen P1H(void);
-extern void mf_amiga_blankrectangle P4H(screencol, screencol, screenrow, screenrow);
-extern void mf_amiga_paintrow P4H(screenrow, pixelcolor, transspec, screencol);
+extern int mf_amiga_initscreen (void);
+extern void mf_amiga_updatescreen (void);
+extern void mf_amiga_blankrectangle (screencol, screencol, screenrow, screenrow);
+extern void mf_amiga_paintrow (screenrow, pixelcolor, transspec, screencol);
#endif
#ifdef EPSFWIN
-extern int mf_epsf_initscreen P1H(void);
-extern void mf_epsf_updatescreen P1H(void);
-extern void mf_epsf_blankrectangle P4H(screencol, screencol, screenrow, screenrow);
-extern void mf_epsf_paintrow P4H(screenrow, pixelcolor, transspec, screencol);
+extern int mf_epsf_initscreen (void);
+extern void mf_epsf_updatescreen (void);
+extern void mf_epsf_blankrectangle (screencol, screencol, screenrow, screenrow);
+extern void mf_epsf_paintrow (screenrow, pixelcolor, transspec, screencol);
#endif
#ifdef HP2627WIN
-extern int mf_hp2627_initscreen P1H(void);
-extern void mf_hp2627_updatescreen P1H(void);
-extern void mf_hp2627_blankrectangle P4H(screencol, screencol, screenrow, screenrow);
-extern void mf_hp2627_paintrow P4H(screenrow, pixelcolor, transspec, screencol);
+extern int mf_hp2627_initscreen (void);
+extern void mf_hp2627_updatescreen (void);
+extern void mf_hp2627_blankrectangle (screencol, screencol, screenrow, screenrow);
+extern void mf_hp2627_paintrow (screenrow, pixelcolor, transspec, screencol);
#endif
#ifdef MFTALKWIN
-extern int mf_mftalk_initscreen P1H(void);
-extern void mf_mftalk_updatescreen P1H(void);
-extern void mf_mftalk_blankrectangle P4H(screencol, screencol, screenrow, screenrow);
-extern void mf_mftalk_paintrow P4H(screenrow, pixelcolor, transspec, screencol);
+extern int mf_mftalk_initscreen (void);
+extern void mf_mftalk_updatescreen (void);
+extern void mf_mftalk_blankrectangle (screencol, screencol, screenrow, screenrow);
+extern void mf_mftalk_paintrow (screenrow, pixelcolor, transspec, screencol);
#endif
#ifdef NEXTWIN
-extern int mf_next_initscreen P1H(void);
-extern void mf_next_updatescreen P1H(void);
-extern void mf_next_blankrectangle P4H(screencol, screencol, screenrow, screenrow);
-extern void mf_next_paintrow P4H(screenrow, pixelcolor, transspec, screencol);
+extern int mf_next_initscreen (void);
+extern void mf_next_updatescreen (void);
+extern void mf_next_blankrectangle (screencol, screencol, screenrow, screenrow);
+extern void mf_next_paintrow (screenrow, pixelcolor, transspec, screencol);
#endif
#ifdef REGISWIN
-extern int mf_regis_initscreen P1H(void);
-extern void mf_regis_updatescreen P1H(void);
-extern void mf_regis_blankrectangle P4H(screencol, screencol, screenrow, screenrow);
-extern void mf_regis_paintrow P4H(screenrow, pixelcolor, transspec, screencol);
+extern int mf_regis_initscreen (void);
+extern void mf_regis_updatescreen (void);
+extern void mf_regis_blankrectangle (screencol, screencol, screenrow, screenrow);
+extern void mf_regis_paintrow (screenrow, pixelcolor, transspec, screencol);
#endif
#ifdef SUNWIN
-extern int mf_sun_initscreen P1H(void);
-extern void mf_sun_updatescreen P1H(void);
-extern void mf_sun_blankrectangle P4H(screencol, screencol, screenrow, screenrow);
-extern void mf_sun_paintrow P4H(screenrow, pixelcolor, transspec, screencol);
+extern int mf_sun_initscreen (void);
+extern void mf_sun_updatescreen (void);
+extern void mf_sun_blankrectangle (screencol, screencol, screenrow, screenrow);
+extern void mf_sun_paintrow (screenrow, pixelcolor, transspec, screencol);
#endif
#ifdef TEKTRONIXWIN
-extern int mf_tektronix_initscreen P1H(void);
-extern void mf_tektronix_updatescreen P1H(void);
-extern void mf_tektronix_blankrectangle P4H(screencol, screencol, screenrow, screenrow);
-extern void mf_tektronix_paintrow P4H(screenrow, pixelcolor, transspec, screencol);
+extern int mf_tektronix_initscreen (void);
+extern void mf_tektronix_updatescreen (void);
+extern void mf_tektronix_blankrectangle (screencol, screencol, screenrow, screenrow);
+extern void mf_tektronix_paintrow (screenrow, pixelcolor, transspec, screencol);
#endif
#ifdef UNITERMWIN
-extern int mf_uniterm_initscreen P1H(void);
-extern void mf_uniterm_updatescreen P1H(void);
-extern void mf_uniterm_blankrectangle P4H(screencol, screencol, screenrow, screenrow);
-extern void mf_uniterm_paintrow P4H(screenrow, pixelcolor, transspec, screencol);
+extern int mf_uniterm_initscreen (void);
+extern void mf_uniterm_updatescreen (void);
+extern void mf_uniterm_blankrectangle (screencol, screencol, screenrow, screenrow);
+extern void mf_uniterm_paintrow (screenrow, pixelcolor, transspec, screencol);
#endif
#ifdef WIN32WIN
-extern int mf_win32_initscreen P1H(void);
-extern void mf_win32_updatescreen P1H(void);
-extern void mf_win32_blankrectangle P4H(screencol, screencol, screenrow, screenrow);
-extern void mf_win32_paintrow P4H(screenrow, pixelcolor, transspec, screencol);
+extern int mf_win32_initscreen (void);
+extern void mf_win32_updatescreen (void);
+extern void mf_win32_blankrectangle (screencol, screencol, screenrow, screenrow);
+extern void mf_win32_paintrow (screenrow, pixelcolor, transspec, screencol);
#endif
#ifdef X11WIN
-extern int mf_x11_initscreen P1H(void);
-extern void mf_x11_updatescreen P1H(void);
-extern void mf_x11_blankrectangle P4H(screencol, screencol, screenrow, screenrow);
-extern void mf_x11_paintrow P4H(screenrow, pixelcolor, transspec, screencol);
+extern int mf_x11_initscreen (void);
+extern void mf_x11_updatescreen (void);
+extern void mf_x11_blankrectangle (screencol, screencol, screenrow, screenrow);
+extern void mf_x11_paintrow (screenrow, pixelcolor, transspec, screencol);
#endif
-extern int mf_trap_initscreen P1H(void);
-extern void mf_trap_updatescreen P1H(void);
-extern void mf_trap_blankrectangle P4H(screencol, screencol, screenrow, screenrow);
-extern void mf_trap_paintrow P4H(screenrow, pixelcolor, transspec, screencol);
+extern int mf_trap_initscreen (void);
+extern void mf_trap_updatescreen (void);
+extern void mf_trap_blankrectangle (screencol, screencol, screenrow, screenrow);
+extern void mf_trap_paintrow (screenrow, pixelcolor, transspec, screencol);
/* This variable, `mfwsw', contains the dispatch tables for each
@@ -2827,10 +2825,10 @@ extern void mf_trap_paintrow P4H(screenrow, pixelcolor, transspec, screencol);
struct mfwin_sw
{
char *mfwsw_type; /* Name of terminal a la TERMCAP. */
- int (*mfwsw_initscreen) P1H(void);
- void (*mfwsw_updatescrn) P1H(void);
- void (*mfwsw_blankrect) P4H(screencol, screencol, screenrow, screenrow);
- void (*mfwsw_paintrow) P4H(screenrow, pixelcolor, transspec, screencol);
+ int (*mfwsw_initscreen) (void);
+ void (*mfwsw_updatescrn) (void);
+ void (*mfwsw_blankrect) (screencol, screencol, screenrow, screenrow);
+ void (*mfwsw_paintrow) (screenrow, pixelcolor, transspec, screencol);
} mfwsw[] =
{
#ifdef AMIGAWIN
@@ -2902,7 +2900,7 @@ static struct mfwin_sw *mfwp;
/* This returns true if we can do window operations, else false. */
boolean
-initscreen P1H(void)
+initscreen (void)
{
/* If MFTERM is set, use it. */
const_string tty_type = kpse_var_value ("MFTERM");
@@ -2968,7 +2966,7 @@ initscreen P1H(void)
/* Make sure everything is visible. */
void
-updatescreen P1H(void)
+updatescreen (void)
{
if (mfwp->mfwsw_updatescrn)
(*mfwp->mfwsw_updatescrn) ();
@@ -2979,8 +2977,8 @@ updatescreen P1H(void)
the background color. */
void
-blankrectangle P4C(screencol, left, screencol, right,
- screenrow, top, screenrow, bottom)
+blankrectangle (screencol left, screencol right,
+ screenrow top, screenrow bottom)
{
if (mfwp->mfwsw_blankrect)
(*mfwp->mfwsw_blankrect) (left, right, top, bottom);
@@ -2992,8 +2990,8 @@ blankrectangle P4C(screencol, left, screencol, right,
switch colors. This goes on for VECTOR_SIZE transitions. */
void
-paintrow P4C(screenrow, row, pixelcolor, init_color,
- transspec, transition_vector, screencol, vector_size)
+paintrow (screenrow row, pixelcolor init_color,
+ transspec transition_vector, screencol vector_size)
{
if (mfwp->mfwsw_paintrow)
(*mfwp->mfwsw_paintrow) (row, init_color, transition_vector, vector_size);
diff --git a/Build/source/texk/web2c/lib/uexit.c b/Build/source/texk/web2c/lib/uexit.c
index 21f34ded35f..744c298d413 100644
--- a/Build/source/texk/web2c/lib/uexit.c
+++ b/Build/source/texk/web2c/lib/uexit.c
@@ -5,7 +5,7 @@
#include "config.h"
void
-uexit P1C(int, unix_code)
+uexit (int unix_code)
{
int final_code;
diff --git a/Build/source/texk/web2c/lib/usage.c b/Build/source/texk/web2c/lib/usage.c
index 194cc73c84d..8e1d416e71f 100644
--- a/Build/source/texk/web2c/lib/usage.c
+++ b/Build/source/texk/web2c/lib/usage.c
@@ -9,7 +9,7 @@
to be the program name. */
void
-usage P1C(const_string, str)
+usage (const_string str)
{
fprintf (stderr, "Try `%s --help' for more information.\n", str);
uexit (1);
@@ -22,7 +22,7 @@ usage P1C(const_string, str)
limitations (sigh).
*/
void
-usagehelp P2C(const_string*, message, const_string,bug_email)
+usagehelp (const_string *message, const_string bug_email)
{
if (!bug_email)
bug_email = "tex-k@mail.tug.org";
diff --git a/Build/source/texk/web2c/lib/win32main.c b/Build/source/texk/web2c/lib/win32main.c
index aa1c1f865d7..0eb6385dd94 100644
--- a/Build/source/texk/web2c/lib/win32main.c
+++ b/Build/source/texk/web2c/lib/win32main.c
@@ -3,11 +3,11 @@
/* The entry point: set up for reading the command line, which will
happen in `topenin', then call the main body. Public domain. */
-extern TEXDLL void mainbody P1H(void);
-extern TEXDLL void maininit P2H(int, string *);
+extern TEXDLL void mainbody (void);
+extern TEXDLL void maininit (int, string *);
int
-main P2C(int, ac, string *, av)
+main (int ac, string *av)
{
#ifdef __EMX__
_wildcard (&ac, &av);
diff --git a/Build/source/texk/web2c/lib/zround.c b/Build/source/texk/web2c/lib/zround.c
index ff951e13f03..a72626cb0a5 100644
--- a/Build/source/texk/web2c/lib/zround.c
+++ b/Build/source/texk/web2c/lib/zround.c
@@ -5,7 +5,7 @@
#include "lib.h"
integer
-zround P1C(double, r)
+zround (double r)
{
integer i;