various "64bit" fixes (mostly templates) excluding introduction of varargs

	Andreas Gruenbacher <agruen@suse.de>

diff --git a/cmd/lefty/ws/x11/gquery.c b/cmd/lefty/ws/x11/gquery.c
index 593c5c9069111e49a3c1b468f0852d4dc7ac5282..7410126479f2a23bcac9c6310bcdd40887e6383d 100644 (file)
--- a/cmd/lefty/ws/x11/gquery.c
+++ b/cmd/lefty/ws/x11/gquery.c
@@ -169,9 +169,10 @@ int GQdestroywidget(Gwidget_t * widget)
     return 0;
 }
 
-int XsraSelFile(Widget toplevel, char *prompt, char *ok, char *cancel,
+extern int XsraSelFile(Widget toplevel, char *prompt, char *ok, char *cancel,
                char *failed, char *init_path, char *mode,
-               int (*show_entry) (), char *name_return, int name_size);
+               int (*show_entry) (char *, char **, struct stat *),
+               char *name_return, int name_size);
 
 int GQqueryask(Gwidget_t * widget, char *prompt, char *args,
               char *responsep, int responsen)

diff --git a/cmd/lefty/ws/x11/libfilereq/SFinternal.h b/cmd/lefty/ws/x11/libfilereq/SFinternal.h
index e04d97494c6cb4cf4ef212f299e20917274f429a..d3e2420ca950047a1484a6ad03088bdd31963380 100644 (file)
--- a/cmd/lefty/ws/x11/libfilereq/SFinternal.h
+++ b/cmd/lefty/ws/x11/libfilereq/SFinternal.h
@@ -49,6 +49,8 @@ extern "C" {
 #include <X11/Xos.h>
 #include <X11/Xaw/Text.h>
 #include <X11/Xaw/AsciiText.h>
+#include <sys/types.h>
+#include <sys/stat.h>
 
 #define SEL_FILE_CANCEL                -1
 #define SEL_FILE_OK            0
@@ -107,18 +109,19 @@ extern "C" {
 
     extern XawTextPosition SFtextPos;
 
-    extern void
-     SFenterList(),
-       SFleaveList(),
-       SFmotionList(), SFbuttonPressList(), SFbuttonReleaseList();
+    extern void SFenterList(Widget w, int n, XEnterWindowEvent *event);
+    extern void SFleaveList(Widget w, int n, XEvent *event);
+    extern void SFmotionList(Widget w, int n, XMotionEvent *event);
+    extern void SFbuttonPressList(Widget w, int n, XButtonPressedEvent *event);
+    extern void SFbuttonReleaseList(Widget w, int n, XButtonReleasedEvent *event);
 
-    extern void
-     SFvSliderMovedCallback(),
-       SFvFloatSliderMovedCallback(),
-       SFhSliderMovedCallback(),
-       SFpathSliderMovedCallback(),
-       SFvAreaSelectedCallback(),
-       SFhAreaSelectedCallback(), SFpathAreaSelectedCallback();
+    extern void SFvSliderMovedCallback(Widget w, int n, int fnew);
+    extern void SFvFloatSliderMovedCallback(Widget w, int n, float *new);
+    extern void SFhSliderMovedCallback(Widget w, int n, float *new);
+    extern void SFpathSliderMovedCallback(Widget w, XtPointer client_data, float *new);
+    extern void SFvAreaSelectedCallback(Widget w, int n, int pnew);
+    extern void SFhAreaSelectedCallback(Widget w, int n, int pnew);
+    extern void SFpathAreaSelectedCallback(Widget w, XtPointer client_data, int pnew);
 
     extern int SFupperX, SFlowerY, SFupperY;
 
@@ -149,15 +152,15 @@ extern "C" {
 
     extern int SFbuttonPressed;
 
-    extern int SFcompareEntries();
+    extern int SFcompareEntries(const void *vp, const void *vq);
 
-    extern void SFdirModTimer();
+    extern void SFdirModTimer(XtPointer cl, XtIntervalId *id);
 
-    extern char SFstatChar();
+    extern char SFstatChar(struct stat *statBuf);
 
     extern XtIntervalId SFdirModTimerId;
 
-    extern int (*SFfunc) ();
+    extern int (*SFfunc) (char *, char **, struct stat *);
 
 #ifdef __cplusplus
 }

diff --git a/cmd/lefty/ws/x11/libfilereq/SelFile.c b/cmd/lefty/ws/x11/libfilereq/SelFile.c
index 5d853895f2984e366f67f70e67b9a070cdc4931a..9720f44bef2b4e30733780b63726b01213b3146f 100644 (file)
--- a/cmd/lefty/ws/x11/libfilereq/SelFile.c
+++ b/cmd/lefty/ws/x11/libfilereq/SelFile.c
@@ -99,9 +99,13 @@ extern char *sys_errlist[];
 
 #include "SFDecls.h"
 
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#else
 #if !defined(SVR4) && !defined(SYSV) && !defined(USG)
 extern char *getwd();
-#endif                         /* !defined(SVR4) && !defined(SYSV) && !defined(USG) */
+#endif /* !defined(SVR4) && !defined(SYSV) && !defined(USG) */
+#endif /* !HAVE_UNISTD_H */
 
 #ifdef HAVE_STDLIB_H
 # include <stdlib.h>
@@ -160,7 +164,7 @@ char SFtextBuffer[MAXPATHLEN];
 
 XtIntervalId SFdirModTimerId;
 
-int (*SFfunc) ();
+int (*SFfunc) (char *, char **, struct stat *);
 
 static char *oneLineTextEditTranslations = "\
        <Key>Return:    redraw-display()\n\
@@ -785,18 +789,10 @@ static void SFprepareToReturn()
 }
 
 int
-XsraSelFile(toplevel, prompt, ok, cancel, failed,
-           init_path, mode, show_entry, name_return, name_size)
-Widget toplevel;
-char *prompt;
-char *ok;
-char *cancel;
-char *failed;
-char *init_path;
-char *mode;
-int (*show_entry) ();
-char *name_return;
-int name_size;
+XsraSelFile(Widget toplevel, char *prompt, char *ok, char *cancel, char *failed,
+           char *init_path, char *mode,
+           int (*show_entry) (char *, char **, struct stat *),
+           char *name_return, int name_size)
 {
     static int firstTime = 1;
     Cardinal i;

diff --git a/configure.ac b/configure.ac
index 1c953da7e58fe0eed9cc01552065b6d22c8198d5..fd1b76edb0d9817e26f2e7796c38602ffff559d4 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -541,7 +541,7 @@ dnl INCLUDES and LIBS for EXPAT
 save_CPPFLAGS=$CPPFLAGS
 save_LDFLAGS=$LDFLAGS
 AC_PATH_PROG(EXPAT_CONFIG,expat-config)
-if [ test -n "$EXPAT_CONFIG" ]; then
+if test -n "$EXPAT_CONFIG"; then
        EXPAT_INCLUDES=`$EXPAT_CONFIG --cflags`
        EXPAT_PREFIX=`$EXPAT_CONFIG --prefix`
        if test "${EXPAT_PREFIX}/lib" != "/usr/lib" ; then
@@ -559,11 +559,11 @@ EXPAT_LIBDIR="/usr/lib"
 AC_ARG_WITH(expatlibdir,
        [  --with-expatlibdir=DIR  use EXPAT libraries from DIR],
        [EXPAT_LIBDIR="$withval"])
-if [ test "$EXPAT_LIBDIR" != "/usr/lib" ]; then
+if test "$EXPAT_LIBDIR" != "/usr/lib"; then
        EXPAT_LIBS="-L$EXPAT_LIBDIR"
        LDFLAGS="$LDFLAGS $EXPAT_LIBS"
 fi
-if [ test -f "$EXPAT_LIBDIR/libexpat.la" ]; then
+if test -f "$EXPAT_LIBDIR/libexpat.la"; then
        EXPAT_LIBS="$EXPAT_LIBDIR/libexpat.la"
 fi
 AC_CHECK_HEADER(expat.h,
@@ -647,10 +647,10 @@ AC_ARG_WITH(zlibdir,
        [Z_LIBS="-L$withval"])
 LDFLAGS="$LDFLAGS $Z_LIBS"
 AC_CHECK_HEADER(zlib.h,
-       AC_CHECK_LIB(z,main,
+       [AC_CHECK_LIB(z,main,
                [Z_LIBS="$Z_LIBS -lz"
                AC_DEFINE_UNQUOTED(HAVE_LIBZ,1,[Define if you have the Z library])],
-                       AC_MSG_WARN(Optional z library not available)),
+                       AC_MSG_WARN(Optional z library not available))],
        AC_MSG_WARN(Optional z library not available - no zlib.h))
 LDFLAGS=$save_LDFLAGS
 CPPFLAGS=$save_CPPFLAGS
@@ -664,9 +664,9 @@ AC_ARG_WITH(mylibgd,
   [AC_HELP_STRING([--with-mylibgd],
                   [use internal gd library in preference to any installed libgd])])
 
-if [ test "x$with_mylibgd" != "xyes" ]; then
+if test "x$with_mylibgd" != "xyes"; then
     AC_PATH_PROG(GDLIB_CONFIG,gdlib-config)
-    if [ test -n "$GDLIB_CONFIG" ]; then
+    if test -n "$GDLIB_CONFIG"; then
         GD_INCLUDES=`$GDLIB_CONFIG --includes`
         GD_LDFLAGS=`$GDLIB_CONFIG --ldflags`
         GD_LIBS=`$GDLIB_CONFIG --libs`
@@ -681,22 +681,22 @@ if [ test "x$with_mylibgd" != "xyes" ]; then
         REQ_GD_MAJORVERSION=2
         REQ_GD_MINORVERSION=0
         REQ_GD_REVISION=33
-        if [ test $GD_MAJORVERSION -lt $REQ_GD_MAJORVERSION ]; then
+        if test $GD_MAJORVERSION -lt $REQ_GD_MAJORVERSION; then
            with_mylibgd=yes
         else
-            if [ test $GD_MAJORVERSION -eq $REQ_GD_MAJORVERSION ]; then
-                if [ test $GD_MINORVERSION -lt $REQ_GD_MINORVERSION ]; then
+            if test $GD_MAJORVERSION -eq $REQ_GD_MAJORVERSION; then
+                if test $GD_MINORVERSION -lt $REQ_GD_MINORVERSION; then
                    with_mylibgd=yes
                else
-                    if [ test $GD_MINORVERSION -eq $REQ_GD_MINORVERSION ]; then
-                       if [ test $GD_REVISION -lt $REQ_GD_REVISION ]; then
+                    if test $GD_MINORVERSION -eq $REQ_GD_MINORVERSION; then
+                       if test $GD_REVISION -lt $REQ_GD_REVISION; then
                            with_mylibgd=yes
                        fi
                    fi
                fi
             fi
         fi
-        if [ test "x$with_mylibgd" = "xyes" ]; then
+        if test "x$with_mylibgd" = "xyes"; then
             AC_MSG_WARN(GD library version < $REQ_GD_MAJORVERSION.$REQ_GD_MINORVERSION.$REQ_GD_REVISION)
         fi
     else
@@ -705,7 +705,7 @@ if [ test "x$with_mylibgd" != "xyes" ]; then
     fi
 fi
 
-if [ test "x$with_mylibgd" != "xyes" ]; then
+if test "x$with_mylibgd" != "xyes"; then
 # see if we can use the external gd lib
     save_CPPFLAGS=$CPPFLAGS
     save_LDFLAGS=$LDFLAGS
@@ -741,7 +741,7 @@ AM_CONDITIONAL(WITH_MYLIBGD, [test "x$with_mylibgd" = "xyes"])
 dnl -----------------------------------
 dnl INCLUDES and LIBS for ICONV (only with mylibgd)
 
-if [ test "x$with_mylibgd" = "xyes" ]; then
+if test "x$with_mylibgd" = "xyes"; then
 
 save_CPPFLAGS=$CPPFLAGS
 save_LDFLAGS=$LDFLAGS
@@ -780,7 +780,7 @@ fi
 dnl ----------------------------------
 dnl INCLUDES and LIBS for FREETYPE (only with mylibgd)
 
-if [ test "x$with_mylibgd" = "xyes" ]; then
+if test "x$with_mylibgd" = "xyes"; then
 
   dnl FreeType configure tests snarfed from libgd ..from libwmf ..
   FREETYPE_DIR="yes" 
@@ -788,25 +788,25 @@ if [ test "x$with_mylibgd" = "xyes" ]; then
   [  --with-freetype=DIR     where to find the freetype 2.x library],
          FREETYPE_DIR=$withval)
 
-  if [ test "x$FREETYPE_DIR" = "xno" ]; then
+  if test "x$FREETYPE_DIR" = "xno"; then
     AC_MSG_WARN(Optional FREETYPE2 library disabled)
   else
                                                                                 
-    if [ test "x$FREETYPE_DIR" != "xyes" ]; then
+    if test "x$FREETYPE_DIR" != "xyes"; then
       AC_PATH_PROG(FREETYPE_CONFIG,freetype-config,,[$FREETYPE_DIR/bin:$PATH])
     else
       AC_PATH_PROG(FREETYPE_CONFIG,freetype-config)
     fi
 
-    if [ test -n "$FREETYPE_CONFIG" ]; then
-      if [ test "x$FREETYPE_DIR" != "xyes" ]; then
+    if test -n "$FREETYPE_CONFIG"; then
+      if test "x$FREETYPE_DIR" != "xyes"; then
         FT_INCLUDES="`$FREETYPE_CONFIG --cflags` -I$FREETYPE_DIR/include"
       else
         FT_INCLUDES=`$FREETYPE_CONFIG --cflags`
       fi
       ft_libtool=`$FREETYPE_CONFIG --libtool`
       # check that it really exists (FreeBSD apparently forgot to insttall it!)
-      if [ test -f "$ft_libtool" ]; then
+      if test -f "$ft_libtool"; then
        FT_LIBTOOL="$ft_libtool"
       else
        FT_LIBTOOL=""
@@ -814,7 +814,7 @@ if [ test "x$with_mylibgd" = "xyes" ]; then
       FT_LIBS=`$FREETYPE_CONFIG --libs`
       FT_LDFLAGS=`echo " $FT_LIBS" |sed 's/ -l[[^ ]][[^ ]]*//g'`
     else
-      if [ test "x$FREETYPE_DIR" != "xyes" ]; then
+      if test "x$FREETYPE_DIR" != "xyes"; then
         FT_INCLUDES="-I$FREETYPE_DIR/include/freetype2 -I$FREETYPE_DIR/include"
         FT_LDFLAGS="-L$FREETYPE_DIR/lib"
         FT_LIBS="-lfreetype"
@@ -850,14 +850,14 @@ fi
 dnl ----------------------------------
 dnl INCLUDES and LIBS for FONTCONFIG (only with mylibgd)
 
-if [ test "x$with_mylibgd" = "xyes" ]; then
+if test "x$with_mylibgd" = "xyes"; then
 
 save_CPPFLAGS=$CPPFLAGS
 save_LDFLAGS=$LDFLAGS
 FC_INCLUDES=""
 FC_LIBS=""
 AC_PATH_PROG(FONTCONFIG_CONFIG,fontconfig-config)
-if [ test -n "$FONTCONFIG_CONFIG" ]; then
+if test -n "$FONTCONFIG_CONFIG"; then
         fc_cflags=`$FONTCONFIG_CONFIG --cflags`
        if test "$fc_cflags" != "-I/usr/include" ; then
                FC_INCLUDES="$fc_cflags"
@@ -896,12 +896,12 @@ fi
 dnl -----------------------------------
 dnl INCLUDES and LIBS for PNG (only with mylibgd)
 
-if [ test "x$with_mylibgd" = "xyes" ]; then
+if test "x$with_mylibgd" = "xyes"; then
 
 save_CPPFLAGS=$CPPFLAGS
 save_LDFLAGS=$LDFLAGS
 AC_PATH_PROG(LIBPNG_CONFIG,libpng-config)
-if [ test -n "$LIBPNG_CONFIG" ]; then
+if test -n "$LIBPNG_CONFIG"; then
         PNG_INCLUDES=`$LIBPNG_CONFIG --cflags`
         PNG_PREFIX=`$LIBPNG_CONFIG --prefix`
        if test "${PNG_PREFIX}/lib" != "/usr/lib" ; then
@@ -936,7 +936,7 @@ fi
 dnl -----------------------------------
 dnl INCLUDES and LIBS for JPEG (only with mylibgd)
 
-if [ test "x$with_mylibgd" = "xyes" ]; then
+if test "x$with_mylibgd" = "xyes"; then
 
 save_CPPFLAGS=$CPPFLAGS
 save_LDFLAGS=$LDFLAGS
@@ -948,11 +948,11 @@ JPEG_LIBDIR="/usr/lib"
 AC_ARG_WITH(jpeglibdir,
        [  --with-jpeglibdir=DIR   use JPEG libraries from DIR],
        [JPEG_LIBDIR="$withval"])
-if [ test "$JPEG_LIBDIR" != "/usr/lib" ]; then
+if test "$JPEG_LIBDIR" != "/usr/lib"; then
        JPEG_LIBS="-L$JPEG_LIBDIR"
        LDFLAGS="$LDFLAGS $JPEG_LIBS"
 fi
-if [ test -f "$JPEG_LIBDIR/libjpeg.la" ]; then
+if test -f "$JPEG_LIBDIR/libjpeg.la"; then
         JPEG_LIBS="$JPEG_LIBDIR/libjpeg.la"
 fi
 AC_CHECK_HEADER(jpeglib.h,
@@ -972,7 +972,7 @@ fi
 dnl -----------------------------------
 dnl INCLUDES and LIBS for cairo
 
-if [ test "x$enable_gvrender" != "xno" ]; then
+if test "x$enable_gvrender" != "xno"; then
        PKG_CHECK_MODULES(CAIRO, cairo >= 0.1.3,
                [AC_DEFINE_UNQUOTED(HAVE_CAIRO,1,
                        [Define if you have the cairo library [EXPERIMENTAL]])],

diff --git a/lib/common/labels.c b/lib/common/labels.c
index 7924e0ef5e03e5bfbb183e58800529d43671e565..efc8cc86025db33dc23f586f927851863915451e 100644 (file)
--- a/lib/common/labels.c
+++ b/lib/common/labels.c
@@ -134,8 +134,8 @@ static void free_textline(textline_t * tl)
     if (tl) {
        if (tl->str)
            free(tl->str);
-       if (tl->xshow);
-       free(tl->xshow);
+       if (tl->xshow)
+           free(tl->xshow);
        free(tl);
     }
 }