Update to libXRes 1.0.4

3 files changed, 26 insertions, 18 deletions

diff --git a/lib/libXRes/src/Makefile.am b/lib/libXRes/src/Makefile.am
index 085d520ee..a64c939be 100644
--- a/lib/libXRes/src/Makefile.am
+++ b/lib/libXRes/src/Makefile.am
@@ -3,9 +3,9 @@ lib_LTLIBRARIES = libXRes.la
 libXRes_la_SOURCES =    \
         XRes.c
 
-libXRes_la_LIBADD = @RESOURCEEXT_LIBS@ @XRES_LIBS@
+libXRes_la_LIBADD = @XRES_LIBS@
 
-AM_CFLAGS = @RESOURCEEXT_CFLAGS@ @XRES_CFLAGS@ @MALLOC_ZERO_CFLAGS@
+AM_CFLAGS = $(CWARNFLAGS) @XRES_CFLAGS@ @MALLOC_ZERO_CFLAGS@
 
 INCLUDES = -I$(top_srcdir)/include
 
diff --git a/lib/libXRes/src/Makefile.in b/lib/libXRes/src/Makefile.in
index a469b10b2..bedbd02a0 100644
--- a/lib/libXRes/src/Makefile.in
+++ b/lib/libXRes/src/Makefile.in
@@ -94,8 +94,10 @@ AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
+CHANGELOG_CMD = @CHANGELOG_CMD@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
+CWARNFLAGS = @CWARNFLAGS@
 CXX = @CXX@
 CXXCPP = @CXXCPP@
 CXXDEPMODE = @CXXDEPMODE@
@@ -105,6 +107,7 @@ DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
 DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
+DSYMUTIL = @DSYMUTIL@
 ECHO = @ECHO@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
@@ -115,6 +118,7 @@ F77 = @F77@
 FFLAGS = @FFLAGS@
 FILE_MAN_DIR = @FILE_MAN_DIR@
 FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
+GREP = @GREP@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -131,6 +135,7 @@ MAKEINFO = @MAKEINFO@
 MALLOC_ZERO_CFLAGS = @MALLOC_ZERO_CFLAGS@
 MISC_MAN_DIR = @MISC_MAN_DIR@
 MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
+NMEDIT = @NMEDIT@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
@@ -141,8 +146,7 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
 RANLIB = @RANLIB@
-RESOURCEEXT_CFLAGS = @RESOURCEEXT_CFLAGS@
-RESOURCEEXT_LIBS = @RESOURCEEXT_LIBS@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
@@ -151,13 +155,9 @@ XMALLOC_ZERO_CFLAGS = @XMALLOC_ZERO_CFLAGS@
 XRES_CFLAGS = @XRES_CFLAGS@
 XRES_LIBS = @XRES_LIBS@
 XTMALLOC_ZERO_CFLAGS = @XTMALLOC_ZERO_CFLAGS@
-ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
-ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
 am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
 am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
 am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
@@ -174,23 +174,31 @@ build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
 datadir = @datadir@
+datarootdir = @datarootdir@
+distcleancheck_listfiles = @distcleancheck_listfiles@
+docdir = @docdir@
+dvidir = @dvidir@
 exec_prefix = @exec_prefix@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
+htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
 libdir = @libdir@
 libexecdir = @libexecdir@
+localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
+psdir = @psdir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 sysconfdir = @sysconfdir@
@@ -199,8 +207,8 @@ lib_LTLIBRARIES = libXRes.la
 libXRes_la_SOURCES = \
         XRes.c
 
-libXRes_la_LIBADD = @RESOURCEEXT_LIBS@ @XRES_LIBS@
-AM_CFLAGS = @RESOURCEEXT_CFLAGS@ @XRES_CFLAGS@ @MALLOC_ZERO_CFLAGS@
+libXRes_la_LIBADD = @XRES_LIBS@
+AM_CFLAGS = $(CWARNFLAGS) @XRES_CFLAGS@ @MALLOC_ZERO_CFLAGS@
 INCLUDES = -I$(top_srcdir)/include
 libXRes_la_LDFLAGS = -version-number 1:0:0 -no-undefined
 libXResincludedir = $(includedir)/X11/extensions
diff --git a/lib/libXRes/src/XRes.c b/lib/libXRes/src/XRes.c
index 06cc78d12..ed6fe527c 100644
--- a/lib/libXRes/src/XRes.c
+++ b/lib/libXRes/src/XRes.c
@@ -47,15 +47,15 @@ static XEXT_GENERATE_FIND_DISPLAY (find_display, xres_ext_info,
 
 Bool XResQueryExtension (
     Display *dpy,
-    int *event_basep,
-    int *error_basep
+    int *event_base_return,
+    int *error_base_return
 )
 {
     XExtDisplayInfo *info = find_display (dpy);
 
     if (XextHasExtension(info)) {
-        *event_basep = info->codes->first_event;
-        *error_basep = info->codes->first_error;
+        *event_base_return = info->codes->first_event;
+        *error_base_return = info->codes->first_error;
         return True;
     } else {
         return False;
@@ -64,8 +64,8 @@ Bool XResQueryExtension (
 
 Status XResQueryVersion(
     Display *dpy,
-    int *major_versionp, 
-    int *minor_versionp
+    int *major_version_return,
+    int *minor_version_return
 )
 {
     XExtDisplayInfo *info = find_display (dpy);
@@ -85,8 +85,8 @@ Status XResQueryVersion(
         SyncHandle ();
         return 0;
     }
-    *major_versionp = rep.server_major;
-    *minor_versionp = rep.server_minor;
+    *major_version_return = rep.server_major;
+    *minor_version_return = rep.server_minor;
     UnlockDisplay (dpy);
     SyncHandle ();
     return 1;