update to libXxf86misc 1.0.2

3 files changed, 28 insertions, 37 deletions

diff --git a/lib/libXxf86misc/src/Makefile.am b/lib/libXxf86misc/src/Makefile.am
index 715b82dc0..4f5b3f3de 100644
--- a/lib/libXxf86misc/src/Makefile.am
+++ b/lib/libXxf86misc/src/Makefile.am
@@ -2,6 +2,6 @@ lib_LTLIBRARIES = libXxf86misc.la
 
 libXxf86misc_la_SOURCES = XF86Misc.c
 
-AM_CFLAGS = $(XXF86MISC_CFLAGS) $(MALLOC_ZERO_CFLAGS)
+AM_CFLAGS = $(CWARNFLAGS) $(XXF86MISC_CFLAGS) $(MALLOC_ZERO_CFLAGS)
 libXxf86misc_la_LIBADD = $(XXF86MISC_LIBS)
 libXxf86misc_la_LDFLAGS = -version-number 1:1:0
diff --git a/lib/libXxf86misc/src/Makefile.in b/lib/libXxf86misc/src/Makefile.in
index 524764f90..8b8b9c7a0 100644
--- a/lib/libXxf86misc/src/Makefile.in
+++ b/lib/libXxf86misc/src/Makefile.in
@@ -81,6 +81,7 @@ ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@
 AMDEP_FALSE = @AMDEP_FALSE@
 AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 APP_MAN_DIR = @APP_MAN_DIR@
 APP_MAN_SUFFIX = @APP_MAN_SUFFIX@
 AR = @AR@
@@ -91,8 +92,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@
@@ -102,6 +105,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@
@@ -112,6 +116,8 @@ F77 = @F77@
 FFLAGS = @FFLAGS@
 FILE_MAN_DIR = @FILE_MAN_DIR@
 FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
+GREP = @GREP@
+INSTALL_CMD = @INSTALL_CMD@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -131,6 +137,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,6 +148,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@
@@ -149,13 +157,9 @@ XMALLOC_ZERO_CFLAGS = @XMALLOC_ZERO_CFLAGS@
 XTMALLOC_ZERO_CFLAGS = @XTMALLOC_ZERO_CFLAGS@
 XXF86MISC_CFLAGS = @XXF86MISC_CFLAGS@
 XXF86MISC_LIBS = @XXF86MISC_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@
@@ -172,30 +176,37 @@ build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
 datadir = @datadir@
+datarootdir = @datarootdir@
+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@
 target_alias = @target_alias@
 lib_LTLIBRARIES = libXxf86misc.la
 libXxf86misc_la_SOURCES = XF86Misc.c
-AM_CFLAGS = $(XXF86MISC_CFLAGS) $(MALLOC_ZERO_CFLAGS)
+AM_CFLAGS = $(CWARNFLAGS) $(XXF86MISC_CFLAGS) $(MALLOC_ZERO_CFLAGS)
 libXxf86misc_la_LIBADD = $(XXF86MISC_LIBS)
 libXxf86misc_la_LDFLAGS = -version-number 1:1:0
 all: config.h
diff --git a/lib/libXxf86misc/src/XF86Misc.c b/lib/libXxf86misc/src/XF86Misc.c
index b0669d527..193224f0b 100644
--- a/lib/libXxf86misc/src/XF86Misc.c
+++ b/lib/libXxf86misc/src/XF86Misc.c
@@ -56,9 +56,7 @@ static XEXT_GENERATE_CLOSE_DISPLAY (close_display, xf86misc_info)
  *                                                                           *
  *****************************************************************************/
 
-Bool XF86MiscQueryExtension (dpy, event_basep, error_basep)
-    Display *dpy;
-    int *event_basep, *error_basep;
+Bool XF86MiscQueryExtension (Display *dpy, int *event_basep, int *error_basep)
 {
     XExtDisplayInfo *info = find_display (dpy);
 
@@ -71,10 +69,7 @@ Bool XF86MiscQueryExtension (dpy, event_basep, error_basep)
     }
 }
 
-Bool XF86MiscQueryVersion(dpy, majorVersion, minorVersion)
-    Display* dpy;
-    int* majorVersion; 
-    int* minorVersion;
+Bool XF86MiscQueryVersion(Display* dpy, int* majorVersion, int* minorVersion)
 {
     XExtDisplayInfo *info = find_display (dpy);
     xXF86MiscQueryVersionReply rep;
@@ -119,9 +114,7 @@ XF86MiscSetClientVersion(Display *dpy)
     return True;
 }
 
-Bool XF86MiscGetMouseSettings(dpy, mouseinfo)
-    Display* dpy;
-    XF86MiscMouseSettings *mouseinfo;
+Bool XF86MiscGetMouseSettings(Display* dpy, XF86MiscMouseSettings *mouseinfo)
 {
     XExtDisplayInfo *info = find_display (dpy);
     xXF86MiscGetMouseSettingsReply rep;
@@ -165,9 +158,7 @@ Bool XF86MiscGetMouseSettings(dpy, mouseinfo)
     return True;
 }
 
-Bool XF86MiscGetKbdSettings(dpy, kbdinfo)
-    Display* dpy;
-    XF86MiscKbdSettings *kbdinfo;
+Bool XF86MiscGetKbdSettings(Display* dpy, XF86MiscKbdSettings *kbdinfo)
 {
     XExtDisplayInfo *info = find_display (dpy);
     xXF86MiscGetKbdSettingsReply rep;
@@ -195,9 +186,7 @@ Bool XF86MiscGetKbdSettings(dpy, kbdinfo)
     return True;
 }
 
-Bool XF86MiscSetMouseSettings(dpy, mouseinfo)
-    Display* dpy;
-    XF86MiscMouseSettings *mouseinfo;
+Bool XF86MiscSetMouseSettings(Display* dpy, XF86MiscMouseSettings *mouseinfo)
 {
     XExtDisplayInfo *info = find_display (dpy);
     xXF86MiscSetMouseSettingsReq *req;
@@ -235,9 +224,7 @@ Bool XF86MiscSetMouseSettings(dpy, mouseinfo)
     return True;
 }
 
-Bool XF86MiscSetKbdSettings(dpy, kbdinfo)
-    Display* dpy;
-    XF86MiscKbdSettings *kbdinfo;
+Bool XF86MiscSetKbdSettings(Display* dpy, XF86MiscKbdSettings *kbdinfo)
 {
     XExtDisplayInfo *info = find_display (dpy);
     xXF86MiscSetKbdSettingsReq *req;
@@ -258,9 +245,7 @@ Bool XF86MiscSetKbdSettings(dpy, kbdinfo)
     return True;
 }
 
-int XF86MiscSetGrabKeysState(dpy, enable)
-    Display* dpy;
-    Bool enable;
+int XF86MiscSetGrabKeysState(Display* dpy, Bool enable)
 {
     XExtDisplayInfo *info = find_display (dpy);
     xXF86MiscSetGrabKeysStateReply rep;
@@ -284,9 +269,7 @@ int XF86MiscSetGrabKeysState(dpy, enable)
     return rep.status;
 }
 
-Bool XF86MiscGetFilePaths(dpy, filpaths)
-    Display* dpy;
-    XF86MiscFilePaths *filpaths;
+Bool XF86MiscGetFilePaths(Display* dpy, XF86MiscFilePaths *filpaths)
 {
     XExtDisplayInfo *info = find_display (dpy);
     xXF86MiscGetFilePathsReply rep;
@@ -354,12 +337,9 @@ Bool XF86MiscGetFilePaths(dpy, filpaths)
     return True;
 }
 
-Status XF86MiscPassMessage(dpy, screen, msgtype, msgval, retmsg)
-    Display* dpy;
-    int screen;
-    const char* msgtype;
-    const char* msgval;
-    char** retmsg;
+Status XF86MiscPassMessage(Display* dpy, int screen,
+			   const char* msgtype, const char* msgval,
+			   char** retmsg)
 {
     XExtDisplayInfo *info = find_display (dpy);
     xXF86MiscPassMessageReply rep;