michael@505: Index: texk/gsftopk/gsftopk.c michael@505: --- texk/gsftopk/gsftopk.c.orig 2005-03-15 13:05:16.817449597 +0100 michael@505: +++ texk/gsftopk/gsftopk.c 2005-03-15 13:06:07.241499293 +0100 michael@505: @@ -417,7 +417,7 @@ michael@505: Boolean dosnames = False; michael@505: Boolean quiet = False; michael@505: michael@505: -struct option { michael@505: +struct option_loc { michael@505: const char *longname; michael@505: short shortname; michael@505: Boolean has_arg; michael@505: @@ -425,7 +425,7 @@ michael@505: int value; michael@505: }; michael@505: michael@505: -static const struct option options[] = { michael@505: +static const struct option_loc options[] = { michael@505: {"test", 't', False, &test, True}, michael@505: {"mapline", 0, True, &mapline, 0}, michael@505: {"mapfile", 0, True, &mapfile, 0}, michael@505: @@ -2099,8 +2099,8 @@ michael@505: michael@505: argp = argv; michael@505: while (++argp < argv + argc && (*argp)[0] == '-') { michael@505: - const struct option *opt_ptr; michael@505: - const struct option *opt; michael@505: + const struct option_loc *opt_ptr; michael@505: + const struct option_loc *opt; michael@505: char *arg = *argp + 1; michael@505: michael@505: if (*arg == '\0') --arg; /* this will flag an error later */ michael@505: michael@505: Index: texk/dvipsk/texc.script michael@505: --- texk/dvipsk/texc.script.orig 2005-09-25 22:05:56 +0200 michael@505: +++ texk/dvipsk/texc.script 2005-09-25 22:05:56 +0200 michael@505: @@ -4,9 +4,7 @@ michael@505: # To use it, say michael@505: # texc.script tex.lpro texc.lpro michael@505: # michael@505: -ed $1 <$2 michael@505: michael@505: Index: texk/web2c/omegafonts/pl.l michael@505: --- texk/web2c/omegafonts/pl.l.orig 2003-05-06 10:30:52 +0200 michael@505: +++ texk/web2c/omegafonts/pl.l 2007-12-22 12:11:05 +0100 michael@505: @@ -63,12 +63,6 @@ michael@505: michael@505: %} michael@505: michael@505: -/* For Solaris's lex, to increase tables sizes --RP */ michael@505: -/* Space before number keeps ancient flex happy. */ michael@505: -%e 4000 michael@505: -%p 7000 michael@505: -%n 1000 michael@505: - michael@505: ws [ \t]+ michael@505: hexnumber H{ws}[A-F0-9]+ michael@505: octnumber O{ws}[0-7]+ michael@505: Index: libs/ncurses/ncurses/tinfo/lib_baudrate.c michael@505: --- libs/ncurses/ncurses/tinfo/lib_baudrate.c.orig 2002-01-20 00:07:53 +0100 michael@505: +++ libs/ncurses/ncurses/tinfo/lib_baudrate.c 2010-01-08 10:40:05 +0100 michael@505: @@ -46,7 +46,7 @@ michael@505: * of the indices up to B115200 fit nicely in a 'short', allowing us to retain michael@505: * ospeed's type for compatibility. michael@505: */ michael@505: -#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) michael@505: +#if defined(__NetBSD__) || defined(__OpenBSD__) michael@505: #undef B0 michael@505: #undef B50 michael@505: #undef B75 michael@505: Index: libs/gd/gd_png.c michael@505: --- libs/gd/gd_png.c.orig 2004-10-28 20:09:52 +0200 michael@505: +++ libs/gd/gd_png.c 2010-01-08 10:57:27 +0100 michael@505: @@ -143,7 +143,7 @@ michael@505: /* first do a quick check that the file really is a PNG image; could michael@505: * have used slightly more general png_sig_cmp() function instead */ michael@505: gdGetBuf (sig, 8, infile); michael@505: - if (!png_check_sig (sig, 8)) michael@505: + if (png_sig_cmp (sig, 0, 8) > 0) michael@505: return NULL; /* bad signature */ michael@505: michael@505: #ifndef PNG_SETJMP_NOT_SUPPORTED michael@505: Index: texk/dvipdfm/pngimage.c michael@505: --- texk/dvipdfm/pngimage.c.orig 2002-12-25 18:51:16 +0100 michael@505: +++ texk/dvipdfm/pngimage.c 2010-01-08 10:58:28 +0100 michael@505: @@ -42,7 +42,7 @@ michael@505: rewind (png_file); michael@505: if (fread (sigbytes, 1, sizeof(sigbytes), png_file) != michael@505: sizeof(sigbytes) || michael@505: - (!png_check_sig (sigbytes, sizeof(sigbytes)))) michael@505: + (png_sig_cmp (sigbytes, 0, sizeof(sigbytes)) > 0)) michael@505: return 0; michael@505: else michael@505: return 1; michael@505: Index: texk/dvipdfm/thumbnail.c michael@505: --- texk/dvipdfm/thumbnail.c.orig 2002-12-25 18:51:16 +0100 michael@505: +++ texk/dvipdfm/thumbnail.c 2010-01-08 10:58:39 +0100 michael@505: @@ -79,7 +79,7 @@ michael@505: } michael@505: if (fread (sigbytes, 1, sizeof(sigbytes), thumb_file) != michael@505: sizeof(sigbytes) || michael@505: - (!png_check_sig (sigbytes, sizeof(sigbytes)))) { michael@505: + (png_sig_cmp (sigbytes, 0, sizeof(sigbytes)) > 0)) { michael@505: fprintf (stderr, "\nThumbnail not a png file! Skipping\n"); michael@505: return NULL; michael@505: } michael@506: Index: texk/dvipsk/afm2tfm.c michael@506: --- texk/dvipsk/afm2tfm.c.orig 2005-01-30 14:17:09.000000000 +0100 michael@506: +++ texk/dvipsk/afm2tfm.c 2012-08-10 13:51:16.204770293 +0200 michael@506: @@ -40,6 +40,9 @@ michael@506: #endif michael@506: #endif /* KPATHSEA */ michael@506: michael@506: +/* Definitions to accommodate flawed or defective code. */ michael@506: +#define getline local_getline michael@506: + michael@506: /* JLH: added these to make the code easier to read and remove some michael@506: ascii<->ebcdic dependencies */ michael@506: #define ASCII_A 65 michael@506: Index: texk/web2c/cpascal.h michael@506: --- texk/web2c/cpascal.h.orig 2004-08-28 22:49:59.000000000 +0200 michael@506: +++ texk/web2c/cpascal.h 2012-08-10 13:50:28.634075696 +0200 michael@506: @@ -241,6 +241,10 @@ michael@506: #define getname vms_getname michael@506: #endif michael@506: michael@506: +/* Definitions to accommodate flawed or defective code. */ michael@506: + michael@506: +#define getline local_getline michael@506: + michael@506: /* Declarations for the routines we provide ourselves in lib/. */ michael@506: michael@506: extern string basenamechangesuffix P3H(const_string,const_string,const_string);