enable compiler warnings

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

6 files changed, 39 insertions, 9 deletions

diff --git a/Build/source/texk/dviljk/ChangeLog b/Build/source/texk/dviljk/ChangeLog
index 110138393f6..568a3b4f74b 100644
--- a/Build/source/texk/dviljk/ChangeLog
+++ b/Build/source/texk/dviljk/ChangeLog
@@ -1,3 +1,11 @@
+2009-06-18  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* Makefile.am (AM_CFLAGS): enable compiler warnings.
+	* dvi2xx.c: #include "tfm.h".
+	(getnum, setOffset, TryResident): declare as static.
+	* tfm.c: #include "tfm.h".
+	* tfm.h (new): protoype for tfm_read_info.
+
 2009-05-07  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	Adapt to TL2009 build system.
diff --git a/Build/source/texk/dviljk/Makefile.am b/Build/source/texk/dviljk/Makefile.am
index 442e4b4f480..5f7a3df8222 100644
--- a/Build/source/texk/dviljk/Makefile.am
+++ b/Build/source/texk/dviljk/Makefile.am
@@ -7,10 +7,13 @@ ACLOCAL_AMFLAGS = -I ../../m4
 
 INCLUDES = $(KPATHSEA_INCLUDES)
 AM_CPPFLAGS = -DKPATHSEA
+AM_CFLAGS = $(WARNING_CFLAGS)
 
 noinst_LIBRARIES = libdvilj.a
 
-libdvilj_a_SOURCES = tfm.c
+libdvilj_a_SOURCES = \
+	tfm.c \
+	tfm.h
 
 libdvilj_a_DEPENDENCIES = $(KPATHSEA_DEPEND)
 
diff --git a/Build/source/texk/dviljk/Makefile.in b/Build/source/texk/dviljk/Makefile.in
index 9e6587e7bae..1eaf27d21ca 100644
--- a/Build/source/texk/dviljk/Makefile.in
+++ b/Build/source/texk/dviljk/Makefile.in
@@ -271,8 +271,12 @@ top_srcdir = @top_srcdir@
 ACLOCAL_AMFLAGS = -I ../../m4
 INCLUDES = $(KPATHSEA_INCLUDES)
 AM_CPPFLAGS = -DKPATHSEA
+AM_CFLAGS = $(WARNING_CFLAGS)
 noinst_LIBRARIES = libdvilj.a
-libdvilj_a_SOURCES = tfm.c
+libdvilj_a_SOURCES = \
+	tfm.c \
+	tfm.h
+
 libdvilj_a_DEPENDENCIES = $(KPATHSEA_DEPEND)
 dist_bin_SCRIPTS = dvihp
 dvilj_CPPFLAGS = -DKPATHSEA -DLJ
diff --git a/Build/source/texk/dviljk/dvi2xx.c b/Build/source/texk/dviljk/dvi2xx.c
index 5ef945d8342..e986b5de2b3 100644
--- a/Build/source/texk/dviljk/dvi2xx.c
+++ b/Build/source/texk/dviljk/dvi2xx.c
@@ -102,6 +102,7 @@
  */
 
 #include "dvi2xx.h"
+#include "tfm.h"
 
 #ifdef SEVENBIT
 #define VIS   33
@@ -776,10 +777,11 @@ char    *str;
 /*********************************************************************/
 /***************************** CopyHPFile ******************************/
 /*********************************************************************/
+static int
 #if NeedFunctionPrototypes
-int getnum(FILEPTR spfp, char *t, char *numstr)
+getnum(FILEPTR spfp, char *t, char *numstr)
 #else
-int getnum(spfp, t, numstr)
+getnum(spfp, t, numstr)
 FILEPTR spfp;
 char *t, *numstr;
 #endif
@@ -791,10 +793,11 @@ char *t, *numstr;
   return atoi(numstr);
 }
 
+static void
 #if NeedFunctionPrototypes
-void setOffset(char dir, char sign, int pos)
+setOffset(char dir, char sign, int pos)
 #else
-void setOffset(dir, sign, pos, first)
+setOffset(dir, sign, pos)
 char dir, sign;
 int pos;
 #endif
@@ -4980,14 +4983,14 @@ long4    conv;           /* conversion factor */
 /**********************************************************************/
 /****************************  TryResident  ***************************/
 /**********************************************************************/
+static bool
 #if NeedFunctionPrototypes
-bool TryResident(struct font_entry *fontptr)
+TryResident(struct font_entry *fontptr)
 #else
-bool TryResident(fontptr)
+TryResident(fontptr)
 struct font_entry *fontptr;
 #endif
 {
-  extern bool tfm_read_info();
   tfm_info_type tfm_info;
 
   /* To determine if a font is resident, check for a special family
diff --git a/Build/source/texk/dviljk/tfm.c b/Build/source/texk/dviljk/tfm.c
index 489340271a3..18d8eac204a 100644
--- a/Build/source/texk/dviljk/tfm.c
+++ b/Build/source/texk/dviljk/tfm.c
@@ -17,6 +17,8 @@ extern char* TFMpath;
 #include "config.h" /* for STRSIZE and tfm_info_type, at least */
                     /* and for IO-functions (since RISC OS) */
 
+#include "tfm.h"
+
 #ifdef NeedVarargsPrototypes
 extern void Fatal(char *, ...);
 #else
diff --git a/Build/source/texk/dviljk/tfm.h b/Build/source/texk/dviljk/tfm.h
new file mode 100644
index 00000000000..c43a496b066
--- /dev/null
+++ b/Build/source/texk/dviljk/tfm.h
@@ -0,0 +1,10 @@
+#ifndef _TFM_H
+#define _TFM_H
+
+#if NeedFunctionPrototypes
+bool tfm_read_info(char *, tfm_info_type *);
+#else
+bool tfm_read_info();
+#endif
+
+#endif /* _TFM_H */