merge libXfont 1.3.2. bump major since some symbols were removed.

3 files changed, 19 insertions, 20 deletions

diff --git a/lib/libXfont/src/builtins/Makefile.in b/lib/libXfont/src/builtins/Makefile.in
index 5bcfbffc0..df8f6417c 100644
--- a/lib/libXfont/src/builtins/Makefile.in
+++ b/lib/libXfont/src/builtins/Makefile.in
@@ -87,6 +87,7 @@ CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DSYMUTIL = @DSYMUTIL@
 ECHO = @ECHO@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
@@ -113,6 +114,7 @@ LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
 MAKEINFO = @MAKEINFO@
 MATH_LIBS = @MATH_LIBS@
+NMEDIT = @NMEDIT@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
@@ -123,6 +125,7 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
 RANLIB = @RANLIB@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
@@ -156,7 +159,9 @@ Z_LIBS = @Z_LIBS@
 ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DSYMUTIL = @ac_ct_DSYMUTIL@
 ac_ct_F77 = @ac_ct_F77@
+ac_ct_NMEDIT = @ac_ct_NMEDIT@
 ac_ct_RANLIB = @ac_ct_RANLIB@
 ac_ct_STRIP = @ac_ct_STRIP@
 ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
diff --git a/lib/libXfont/src/builtins/dir.c b/lib/libXfont/src/builtins/dir.c
index f641ece51..fa811b5c3 100644
--- a/lib/libXfont/src/builtins/dir.c
+++ b/lib/libXfont/src/builtins/dir.c
@@ -29,7 +29,7 @@
 #endif
 #include "builtin.h"
 
-BuiltinDirPtr
+static BuiltinDirPtr
 BuiltinDirsDup (const BuiltinDirPtr a_dirs,
                 int a_dirs_len)
 {
@@ -60,7 +60,7 @@ BuiltinDirsDup (const BuiltinDirPtr a_dirs,
  * @param a_saved the saved instance of BuiltinDir to copy into a_cur
  * @return 0 if went okay, 1 otherwise.
  */
-int
+static int
 BuiltinDirRestore (BuiltinDirPtr a_cur,
                    const BuiltinDirPtr a_saved)
 {
@@ -75,7 +75,7 @@ BuiltinDirRestore (BuiltinDirPtr a_cur,
 }
 
 
-int
+static int
 BuiltinDirsRestore (BuiltinDirPtr a_cur_tab,
                     const BuiltinDirPtr a_saved_tab,
                     int a_tab_len)
@@ -94,7 +94,7 @@ BuiltinDirsRestore (BuiltinDirPtr a_cur_tab,
     return 0 ;
 }
 
-BuiltinAliasPtr
+static BuiltinAliasPtr
 BuiltinAliasesDup (const BuiltinAliasPtr a_aliases,
                    int a_aliases_len)
 {
@@ -122,7 +122,7 @@ BuiltinAliasesDup (const BuiltinAliasPtr a_aliases,
  * @param a_saved the saved instance of BuiltinAlias to copy into a_cur
  * @return 0 if went okay, 1 otherwise.
  */
-int
+static int
 BuiltinAliasRestore (BuiltinAliasPtr a_cur,
                      const BuiltinAliasPtr a_save)
 {
@@ -137,7 +137,7 @@ BuiltinAliasRestore (BuiltinAliasPtr a_cur,
     return 0 ;
 }
 
-int
+static int
 BuiltinAliasesRestore (BuiltinAliasPtr a_cur_tab,
                        const BuiltinAliasPtr a_saved_tab,
                        int a_tab_len)
diff --git a/lib/libXfont/src/builtins/file.c b/lib/libXfont/src/builtins/file.c
index 1f73134e6..a46b0a65e 100644
--- a/lib/libXfont/src/builtins/file.c
+++ b/lib/libXfont/src/builtins/file.c
@@ -27,6 +27,7 @@
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
+#include <string.h>
 #include "builtin.h"
 
 typedef struct _BuiltinIO {
@@ -35,8 +36,7 @@ typedef struct _BuiltinIO {
 } BuiltinIORec, *BuiltinIOPtr;
 
 static int
-BuiltinFill (f)
-    BufFilePtr	f;
+BuiltinFill (BufFilePtr	f)
 {
     int	    left, len;
     BuiltinIOPtr    io = ((BuiltinIOPtr) f->private);
@@ -50,7 +50,7 @@ BuiltinFill (f)
     len = BUFFILESIZE;
     if (len > left)
 	len = left;
-    bcopy (io->file->bits + io->offset, f->buffer, len);
+    memcpy (f->buffer, io->file->bits + io->offset, len);
     io->offset += len;
     f->left = len - 1;
     f->bufp = f->buffer + 1;
@@ -58,15 +58,12 @@ BuiltinFill (f)
 }
 
 static int
-BuiltinSkip (f, count)
-    BufFilePtr	f;
-    int		count;
+BuiltinSkip (BufFilePtr	f, int count)
 {
     BuiltinIOPtr    io = ((BuiltinIOPtr) f->private);
     int	    curoff;
     int	    fileoff;
     int	    todo;
-    int	    left;
 
     curoff = f->bufp - f->buffer;
     fileoff = curoff + f->left;
@@ -86,8 +83,7 @@ BuiltinSkip (f, count)
 }
 
 static int
-BuiltinClose (f, doClose)
-    BufFilePtr	f;
+BuiltinClose (BufFilePtr f, int unused)
 {
     BuiltinIOPtr    io = ((BuiltinIOPtr) f->private);
     
@@ -97,8 +93,7 @@ BuiltinClose (f, doClose)
 
 
 FontFilePtr
-BuiltinFileOpen (name)
-    char    *name;
+BuiltinFileOpen (char *name)
 {
     int		    i;
     BuiltinIOPtr    io;
@@ -121,7 +116,7 @@ BuiltinFileOpen (name)
 	xfree (io);
 	return NULL;
     }
-    if (cooked = BufFilePushZIP (raw))
+    if ((cooked = BufFilePushZIP (raw)))
 	raw = cooked;
     else
     {
@@ -132,8 +127,7 @@ BuiltinFileOpen (name)
 }
 
 int
-BuiltinFileClose (f)
-    FontFilePtr	f;
+BuiltinFileClose (FontFilePtr f, int unused)
 {
     return BufFileClose ((BufFilePtr) f, TRUE);
 }