From 123c3f5ff16e3565a9445dcacc38b249c64e7744 Mon Sep 17 00:00:00 2001 From: Peter Breitenlohner Date: Tue, 23 Jun 2009 16:22:59 +0000 Subject: always use prototypes, drop #ifdef HAVE_PROTOTYPES git-svn-id: svn://tug.org/texlive/trunk@13920 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/texk/ps2pkm/fontfcn.c | 2 -- Build/source/texk/ps2pkm/regions.c | 28 ---------------------------- Build/source/texk/ps2pkm/regions.h | 4 ---- Build/source/texk/ps2pkm/scanfont.c | 2 -- Build/source/texk/ps2pkm/t1funcs.c | 23 ----------------------- 5 files changed, 59 deletions(-) (limited to 'Build/source/texk/ps2pkm') diff --git a/Build/source/texk/ps2pkm/fontfcn.c b/Build/source/texk/ps2pkm/fontfcn.c index 17423b3745a..d3dd4285196 100644 --- a/Build/source/texk/ps2pkm/fontfcn.c +++ b/Build/source/texk/ps2pkm/fontfcn.c @@ -36,9 +36,7 @@ #include "fontfcn.h" #include "fontmisc.h" -#ifdef HAVE_PROTOTYPES extern void objFormatName(psobj *, int, char *); -#endif extern xobject Type1Char(); extern boolean Init_BuiltInEncoding(); diff --git a/Build/source/texk/ps2pkm/regions.c b/Build/source/texk/ps2pkm/regions.c index abe0da5ac6c..6d778b9e8d4 100644 --- a/Build/source/texk/ps2pkm/regions.c +++ b/Build/source/texk/ps2pkm/regions.c @@ -52,7 +52,6 @@ The included files are: #include "hints.h" #include "strokes.h" /* to pick up 'DoStroke' */ static int Unwind(); -#ifdef HAVE_PROTOTYPES static void newfilledge(register struct region *, fractpel, fractpel, fractpel, fractpel, int); static void vertjoin(register struct edgelist *, register struct edgelist *); @@ -61,13 +60,6 @@ static void cedgemin(register int, register pel *, register pel); static void cedgemax(register int, register pel *, register pel); static void edgemin(register int, register pel *, register pel *); static void edgemax(register int, register pel *, register pel *); -#else -static int newfilledge(); -static int vertjoin(); -static discard(); -static int edgemin(); -static int edgemax(); -#endif static struct edgelist *splitedge(); static int touches(); static int crosses(); @@ -747,16 +739,8 @@ This function also has to keep the bounding box of the region up to date. */ -#ifdef HAVE_PROTOTYPES static void newfilledge(register struct region *R, fractpel xmin, fractpel xmax, fractpel ymin, fractpel ymax, int isdown) -#else -static int newfilledge(R, xmin, xmax, ymin, ymax, isdown) - register struct region *R; /* region being built */ - fractpel xmin,xmax; /* X range of this edge */ - fractpel ymin,ymax; /* Y range of this edge */ - int isdown; /* flag: TRUE means edge goes down, else up */ -#endif { struct edgelist *swathxsort(); /* 'SortSwath' function */ @@ -996,14 +980,8 @@ Then, we return the caller a pointer to 'new': The two edges must be disjoint vertically. */ -#ifdef HAVE_PROTOTYPES static void vertjoin(register struct edgelist *top, register struct edgelist *bottom) -#else -static int vertjoin(top, bottom) - register struct edgelist *top; /* uppermost region */ - register struct edgelist *bottom; /* bottommost region */ -#endif { if (BOTTOM(top) > TOP(bottom)) t1_abort("vertjoin not disjoint"); @@ -1360,13 +1338,7 @@ So, to mark a 'edgelist' structure as discarded, we move it to the end of the list and set ymin=ymax. */ -#ifdef HAVE_PROTOTYPES static void discard(register struct edgelist *left, register struct edgelist *right) -#else -static discard(left, right) - register struct edgelist *left,*right; /* all edges between here exclusive */ - /* should be discarded */ -#endif { register struct edgelist *beg,*end,*p; diff --git a/Build/source/texk/ps2pkm/regions.h b/Build/source/texk/ps2pkm/regions.h index 11fb250364c..f493f996b6e 100644 --- a/Build/source/texk/ps2pkm/regions.h +++ b/Build/source/texk/ps2pkm/regions.h @@ -134,13 +134,9 @@ scratchpad areas used while the region is being built: struct edgelist *lastedge,*firstedge; /* last and first edges in subpath */ pel *edge; /* pointer to array of X values for edge */ fractpel edgeYstop; /* Y value where 'edges' array ends */ -#if defined(HAVE_PROTOTYPES) void (*newedgefcn)(struct region *, fractpel, fractpel, fractpel, fractpel, int); /* function to use when building a new edge */ -#else - int (*newedgefcn)(); /* function to use when building a new edge */ -#endif struct strokeinfo *strokeinfo; /* scratchpad info during stroking only */ } ; /* diff --git a/Build/source/texk/ps2pkm/scanfont.c b/Build/source/texk/ps2pkm/scanfont.c index 3a648a49551..e63343d5704 100644 --- a/Build/source/texk/ps2pkm/scanfont.c +++ b/Build/source/texk/ps2pkm/scanfont.c @@ -39,7 +39,6 @@ #include "blues.h" -#ifdef HAVE_PROTOTYPES extern void objFormatInteger(psobj *,int); extern void objFormatReal(psobj *, float); extern void objFormatBoolean(psobj *, boolean); @@ -51,7 +50,6 @@ extern void objFormatFile(psobj *, FILE *); extern int SearchDictName(psdict *, psobj *); extern int T1Getc(struct F_FILE *f); extern int T1Ungetc(int c,struct F_FILE *f); -#endif static int rc; static boolean InPrivateDict; diff --git a/Build/source/texk/ps2pkm/t1funcs.c b/Build/source/texk/ps2pkm/t1funcs.c index a56bb4087d2..d68b8098439 100644 --- a/Build/source/texk/ps2pkm/t1funcs.c +++ b/Build/source/texk/ps2pkm/t1funcs.c @@ -72,7 +72,6 @@ typedef char *encoding[256]; -#ifdef HAVE_PROTOTYPES int Type1OpenScalable(char **ev, struct _Font **ppFont, int flags, struct _FontEntry *entry, char *fileName, struct _FontScalable *vals, fsBitmapFormat format, @@ -105,28 +104,6 @@ extern void QueryFontLib(char *env,char *infoName,void *infoValue,int *rcodeP); extern void T1FillFontInfo(struct _Font *pFont,struct _FontScalable *Vals,char *Filename,char *Fontname); extern void T1InitStdProps(void); extern int FontFileRegisterRenderer(FontRendererRec *); -#else -int Type1OpenScalable (); -static int Type1GetGlyphs(); -void Type1CloseFont(); -extern int Type1GetInfoScalable (); - -static int Type1GetMetrics (); - -static void fillrun(); - -extern char *Xalloc(); -extern void Xfree(); -static void fill(); - -extern Bool fontfcnA(); -extern struct region *fontfcnB(); -extern int CheckFSFormat(); -extern void QueryFontLib(); -extern void T1FillFontInfo(); -extern void T1InitStdProps(); -extern int FontFileRegisterRenderer(); -#endif extern psfont *FontP; extern psobj *ISOLatin1EncArrayP; -- cgit v1.2.3