enable compiler warnings

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

7 files changed, 32 insertions, 71 deletions

diff --git a/Build/source/texk/dvi2tty/ChangeLog b/Build/source/texk/dvi2tty/ChangeLog
index b391a2168fa..c715173de65 100644
--- a/Build/source/texk/dvi2tty/ChangeLog
+++ b/Build/source/texk/dvi2tty/ChangeLog
@@ -1,3 +1,8 @@
+2009-06-20  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* Makefile.am: enable compiler warnings.
+	* disdvi.c, dvi2tty.c, dvi2tty.h, dvistuff.c: ANSI C prototypes.
+
 2009-06-15  Karl Berry  <karl@tug.org>
 
 	* dvi2tty.c,
diff --git a/Build/source/texk/dvi2tty/Makefile.am b/Build/source/texk/dvi2tty/Makefile.am
index 8082c0aa0d1..d747c34aad0 100644
--- a/Build/source/texk/dvi2tty/Makefile.am
+++ b/Build/source/texk/dvi2tty/Makefile.am
@@ -7,6 +7,7 @@ ACLOCAL_AMFLAGS = -I ../../m4
 
 INCLUDES = $(KPATHSEA_INCLUDES)
 AM_CPPFLAGS = -DUNIX -DKPATHSEA
+AM_CFLAGS = $(WARNING_CFLAGS)
 
 LDADD = $(KPATHSEA_LIBS)
 
diff --git a/Build/source/texk/dvi2tty/Makefile.in b/Build/source/texk/dvi2tty/Makefile.in
index 3b6bf668dbb..0096723ca3e 100644
--- a/Build/source/texk/dvi2tty/Makefile.in
+++ b/Build/source/texk/dvi2tty/Makefile.in
@@ -247,6 +247,7 @@ top_srcdir = @top_srcdir@
 ACLOCAL_AMFLAGS = -I ../../m4
 INCLUDES = $(KPATHSEA_INCLUDES)
 AM_CPPFLAGS = -DUNIX -DKPATHSEA
+AM_CFLAGS = $(WARNING_CFLAGS)
 LDADD = $(KPATHSEA_LIBS)
 disdvi_SOURCES = \
 	commands.h \
diff --git a/Build/source/texk/dvi2tty/disdvi.c b/Build/source/texk/dvi2tty/disdvi.c
index dba9754787a..a7361783a6a 100644
--- a/Build/source/texk/dvi2tty/disdvi.c
+++ b/Build/source/texk/dvi2tty/disdvi.c
@@ -54,17 +54,17 @@ char * dvi_name;
 long   pc = 0;
 
 #ifdef KPATHSEA
-extern int main P2H(int argc,char **argv );
-extern void bop P1H(void);
-extern void postamble P1H(void);
-extern void preamble P1H(void);
-extern void postpostamble P1H(void);
-extern void special P1H(int x);
-extern void fontdef P1H(int x);
-extern char *fontname P1H(long fntnum);
-extern void printnonprint P1H(int ch);
-extern unsigned long num P1H(int size);
-extern long snum P1H(int size);
+extern int main(int argc,char **argv );
+extern void bop(void);
+extern void postamble(void);
+extern void preamble(void);
+extern void postpostamble(void);
+extern void special(int x);
+extern void fontdef(int x);
+extern char *fontname(long fntnum);
+extern void printnonprint(int ch);
+extern unsigned long num(int size);
+extern long snum(int size);
 #else
 char *          malloc          ();
 
diff --git a/Build/source/texk/dvi2tty/dvi2tty.c b/Build/source/texk/dvi2tty/dvi2tty.c
index 01094c1b8fc..ac75ba6b645 100644
--- a/Build/source/texk/dvi2tty/dvi2tty.c
+++ b/Build/source/texk/dvi2tty/dvi2tty.c
@@ -167,26 +167,16 @@ char            optch;          /* for option handling                       */
 
 /*---------------------------------------------------------------------------*/
 
-#ifdef KPATHSEA
-int     main       P2H(int, char **); 
-void    setoption  P1H(char *);
-void    getargs    P1H(void);
-void    getpages   P2H(int, char *);
-void    plcnxt     P1H(int);
-void    getfname   P1H(char *);
-int     getinteger P3H(int *, int *, char *);
-void    usage      P1H(int);
-#else
-#  if defined(MSDOS)
-int     main      (int, char **); 
-void    setoption (char *);
-void    getargs   (void);
-void    getpages  (int, char *);
-void    plcnxt    (int);
+#if defined(KPATHSEA) || defined(MSDOS)
+int     main       (int, char **); 
+void    setoption  (char *);
+void    getargs    (void);
+void    getpages   (int, char *);
+void    plcnxt     (int);
 void    getfname   (char *);
-int     getinteger(int *, int *, char *);
-void    usage     (int);
-#  else
+int     getinteger (int *, int *, char *);
+void    usage      (int);
+#else
 char *  getenv    ();
 FILE *  popen     ();
 
@@ -198,7 +188,6 @@ void    plcnxt    ();
 void    getfname   ();
 int     getinteger();
 void    usage     ();
-#  endif
 #endif
 
 /****************************************************************************/
diff --git a/Build/source/texk/dvi2tty/dvi2tty.h b/Build/source/texk/dvi2tty/dvi2tty.h
index baa965f4fe9..1a0362df040 100644
--- a/Build/source/texk/dvi2tty/dvi2tty.h
+++ b/Build/source/texk/dvi2tty/dvi2tty.h
@@ -86,23 +86,15 @@ extern FILE *output;                   /* output file (dvi2tty.c)            */
 /*---------------------------------------------------------------------------*/
 
 /* dvi2tty.c */
-#if defined(KPATHSEA)
-void errorexit P1H(int);
-#else
-#if defined(MSDOS)
+#if defined(KPATHSEA) || defined(MSDOS)
 void errorexit(int);
 #else
 void errorexit();
 #endif
-#endif
 
 /* dvistuff.c */
-#if defined(KPATHSEA)
-void dvimain P1H(void);
-#else
-#if defined(MSDOS)
+#if defined(KPATHSEA) || defined(MSDOS)
 void dvimain(void);
 #else
 void dvimain();
 #endif
-#endif
diff --git a/Build/source/texk/dvi2tty/dvistuff.c b/Build/source/texk/dvi2tty/dvistuff.c
index 764bf522978..57a0e2c5b93 100644
--- a/Build/source/texk/dvi2tty/dvistuff.c
+++ b/Build/source/texk/dvi2tty/dvistuff.c
@@ -110,33 +110,7 @@ int  symbolfont = FALSE;        /* true if font is a symbol font             */
 
 /*---------------------------------------------------------------------------*/
 
-#ifdef KPATHSEA
-void            postamble       P1H(void);
-void            preamble        P1H(void);
-void            walkpages       P1H(void);
-void            initpage        P1H(void);
-void            dopage          P1H(void);
-void            skippage        P1H(void);
-void            printpage       P1H(void);
-bool            inlist          P1H(long);
-void            rule            P3H(bool, long, long);
-void            ruleaux         P3H(long, long, char);
-long            horizontalmove  P1H(long);
-int             skipnops        P1H(void);
-linetype    *   texlive_getline         P1H(void);
-linetype    *   findline        P1H(void);
-unsigned long   num             P1H(int);
-long            snum            P1H(int);
-void            dochar          P1H(char);
-void            symchar         P1H(char);
-void            normchar        P1H(char);
-void            outchar         P1H(unsigned char);
-void            putcharacter    P1H(long);
-void            setchar         P1H(long);
-void            fontdef         P1H(int);
-void            setfont         P1H(long);
-#else
-#  if defined(MSDOS)
+#if defined(KPATHSEA) || defined(MSDOS)
 void            postamble       (void);
 void            preamble        (void);
 void            walkpages       (void);
@@ -149,7 +123,7 @@ void            rule            (bool, long, long);
 void            ruleaux         (long, long, char);
 long            horizontalmove  (long);
 int             skipnops        (void);
-linetype    *   texlive_getline         (void);
+linetype    *   texlive_getline (void);
 linetype    *   findline        (void);
 unsigned long   num             (int);
 long            snum            (int);
@@ -174,7 +148,7 @@ void            rule            ();
 void            ruleaux         ();
 long            horizontalmove  ();
 int             skipnops        ();
-linetype    *   texlive_getline         ();
+linetype    *   texlive_getline ();
 linetype    *   findline        ();
 unsigned long   num             ();
 long            snum            ();
@@ -192,7 +166,6 @@ long		vms_ftell	();
 long		vms_ungetc	();
 #endif
 #endif
-#endif
 
 /*---------------------------------------------------------------------------*/
 /*---------------------------------------------------------------------------*/