update to libXfixes 4.0.4

5 files changed, 37 insertions, 29 deletions

diff --git a/lib/libXfixes/src/Cursor.c b/lib/libXfixes/src/Cursor.c
index dac1f1c48..5fd8efe38 100644
--- a/lib/libXfixes/src/Cursor.c
+++ b/lib/libXfixes/src/Cursor.c
@@ -79,7 +79,7 @@ XFixesGetCursorImage (Display *dpy)
     XFixesCursorImage			*image;
     char				*name;
 
-    XFixesCheckExtension (dpy, info, 0);
+    XFixesCheckExtension (dpy, info, NULL);
     LockDisplay (dpy);
     GetReq (XFixesGetCursorImageAndName, req);
     req->reqType = info->codes->major_opcode;
@@ -91,7 +91,7 @@ XFixesGetCursorImage (Display *dpy)
     {
 	UnlockDisplay (dpy);
 	SyncHandle ();
-	return 0;
+	return NULL;
     }
     if (info->major_version < 2)
     {
@@ -115,7 +115,7 @@ XFixesGetCursorImage (Display *dpy)
 	_XEatData (dpy, nbytes);
 	UnlockDisplay (dpy);
 	SyncHandle ();
-	return 0;
+	return NULL;
     }
     image->x = rep.x;
     image->y = rep.y;
@@ -171,9 +171,9 @@ XFixesGetCursorName (Display *dpy, Cursor cursor, Atom *atom)
     xXFixesGetCursorNameReply	rep;
     char			*name;
 
-    XFixesCheckExtension (dpy, info, 0);
+    XFixesCheckExtension (dpy, info, NULL);
     if (info->major_version < 2)
-	return 0;
+	return NULL;
     LockDisplay (dpy);
     GetReq (XFixesGetCursorName, req);
     req->reqType = info->codes->major_opcode;
@@ -183,7 +183,7 @@ XFixesGetCursorName (Display *dpy, Cursor cursor, Atom *atom)
     {
 	UnlockDisplay (dpy);
 	SyncHandle ();
-	return 0;
+	return NULL;
     }
     *atom = rep.atom;
     if ((name = (char *) Xmalloc(rep.nbytes+1))) {
diff --git a/lib/libXfixes/src/Makefile.am b/lib/libXfixes/src/Makefile.am
index 27ba0275e..544230fe0 100644
--- a/lib/libXfixes/src/Makefile.am
+++ b/lib/libXfixes/src/Makefile.am
@@ -8,8 +8,8 @@ libXfixes_la_SOURCES = 	\
 	Xfixes.c	\
 	Xfixesint.h
 
-libXfixes_la_LIBADD = @X_LIBS@
-AM_CFLAGS = @X_CFLAGS@ @FIXESEXT_CFLAGS@
+libXfixes_la_LIBADD = @FIXESEXT_LIBS@
+AM_CFLAGS = $(CWARNFLAGS) @FIXESEXT_CFLAGS@
 
 INCLUDES = -I$(top_srcdir)/include/X11/extensions
 
diff --git a/lib/libXfixes/src/Makefile.in b/lib/libXfixes/src/Makefile.in
index 83bfa8b7f..3a6bebd39 100644
--- a/lib/libXfixes/src/Makefile.in
+++ b/lib/libXfixes/src/Makefile.in
@@ -95,8 +95,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@
@@ -106,6 +108,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@
@@ -119,6 +122,7 @@ FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
 FIXESEXT_CFLAGS = @FIXESEXT_CFLAGS@
 FIXESEXT_LIBS = @FIXESEXT_LIBS@
 FIXESEXT_VERSION = @FIXESEXT_VERSION@
+GREP = @GREP@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -137,6 +141,7 @@ MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
 MISC_MAN_DIR = @MISC_MAN_DIR@
 MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
+NMEDIT = @NMEDIT@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
@@ -147,19 +152,14 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
 RANLIB = @RANLIB@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
 VERSION = @VERSION@
-X_CFLAGS = @X_CFLAGS@
-X_LIBS = @X_LIBS@
-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@
@@ -176,23 +176,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@
@@ -206,8 +214,8 @@ libXfixes_la_SOURCES = \
 	Xfixes.c	\
 	Xfixesint.h
 
-libXfixes_la_LIBADD = @X_LIBS@
-AM_CFLAGS = @X_CFLAGS@ @FIXESEXT_CFLAGS@
+libXfixes_la_LIBADD = @FIXESEXT_LIBS@
+AM_CFLAGS = $(CWARNFLAGS) @FIXESEXT_CFLAGS@
 INCLUDES = -I$(top_srcdir)/include/X11/extensions
 libXfixes_la_LDFLAGS = -version-number 3:1:0 -no-undefined
 libXfixesincludedir = $(includedir)/X11/extensions
diff --git a/lib/libXfixes/src/Region.c b/lib/libXfixes/src/Region.c
index e37e54556..842da06bc 100644
--- a/lib/libXfixes/src/Region.c
+++ b/lib/libXfixes/src/Region.c
@@ -1,6 +1,4 @@
 /*
- * $Id: Region.c,v 1.1 2006/11/25 17:11:05 matthieu Exp $
- *
  * Copyright © 2003 Keith Packard
  *
  * Permission to use, copy, modify, distribute, and sell this software and its
@@ -318,7 +316,7 @@ XFixesFetchRegionAndBounds (Display	    *dpy,
     long    			nbytes;
     long			nread;
 
-    XFixesCheckExtension (dpy, info, 0);
+    XFixesCheckExtension (dpy, info, NULL);
     LockDisplay (dpy);
     GetReq (XFixesFetchRegion, req);
     req->reqType = info->codes->major_opcode;
@@ -329,7 +327,7 @@ XFixesFetchRegionAndBounds (Display	    *dpy,
     {
 	UnlockDisplay (dpy);
 	SyncHandle ();
-	return 0;
+	return NULL;
     }
     bounds->x = rep.x;
     bounds->y = rep.y;
@@ -344,7 +342,7 @@ XFixesFetchRegionAndBounds (Display	    *dpy,
 	_XEatData (dpy, nbytes);
 	UnlockDisplay (dpy);
 	SyncHandle ();
-	return 0;
+	return NULL;
     }
     _XRead16 (dpy, (short *) rects, nrects << 3);
     /* skip any padding */
diff --git a/lib/libXfixes/src/Xfixes.c b/lib/libXfixes/src/Xfixes.c
index cf56b5abb..b9b0fb677 100644
--- a/lib/libXfixes/src/Xfixes.c
+++ b/lib/libXfixes/src/Xfixes.c
@@ -87,7 +87,7 @@ XFixesExtAddDisplay (XFixesExtInfo *extinfo,
 	    UnlockDisplay (dpy);
 	    SyncHandle ();
 	    Xfree(info);
-	    return 0;
+	    return NULL;
 	}
 	info->major_version = rep.majorVersion;
 	info->minor_version = rep.minorVersion;
@@ -297,14 +297,16 @@ XFixesEventToWire(Display *dpy, XEvent *event, xEvent *wire)
 }
 
 Bool 
-XFixesQueryExtension (Display *dpy, int *event_basep, int *error_basep)
+XFixesQueryExtension (Display *dpy,
+			int *event_base_return,
+			int *error_base_return)
 {
     XFixesExtDisplayInfo *info = XFixesFindDisplay (dpy);
 
     if (XFixesHasExtension(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
@@ -313,15 +315,15 @@ XFixesQueryExtension (Display *dpy, int *event_basep, int *error_basep)
 
 Status 
 XFixesQueryVersion (Display *dpy,
-		    int	    *major_versionp,
-		    int	    *minor_versionp)
+		    int	    *major_version_return,
+		    int	    *minor_version_return)
 {
     XFixesExtDisplayInfo	*info = XFixesFindDisplay (dpy);
 
     XFixesCheckExtension (dpy, info, 0);
 
-    *major_versionp = info->major_version;
-    *minor_versionp = info->minor_version;
+    *major_version_return = info->major_version;
+    *minor_version_return = info->minor_version;
     return 1;
 }