Update to libXinerama 1.1

2 files changed, 25 insertions, 19 deletions

diff --git a/lib/libXinerama/man/Makefile.in b/lib/libXinerama/man/Makefile.in
index 76251c72b..878af2c6a 100644
--- a/lib/libXinerama/man/Makefile.in
+++ b/lib/libXinerama/man/Makefile.in
@@ -89,6 +89,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@
@@ -99,8 +100,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@
@@ -121,6 +124,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@
@@ -164,15 +169,9 @@ XINERAMA_CFLAGS = @XINERAMA_CFLAGS@
 XINERAMA_LIBS = @XINERAMA_LIBS@
 XMALLOC_ZERO_CFLAGS = @XMALLOC_ZERO_CFLAGS@
 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_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@
 am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
 am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
 am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
@@ -189,23 +188,30 @@ 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@
diff --git a/lib/libXinerama/man/Xinerama.man b/lib/libXinerama/man/Xinerama.man
index bec9f80ff..74bc53d03 100644
--- a/lib/libXinerama/man/Xinerama.man
+++ b/lib/libXinerama/man/Xinerama.man
@@ -41,11 +41,11 @@ Xinerama \- API for Xinerama extension to X11 Protocol
 .nf    
 .sp
 Bool XineramaQueryExtension \^(\^Display *\fIdpy\fP, 
-	int *\fIevent_basep\fP, int *\fIerror_basep\fP\^);
+	int *\fIevent_base_return\fP, int *\fIerror_base_return\fP\^);
 .sp
 Status XineramaQueryVersion \^(\^Display *\fIdpy\fP,
-	int *\fImajor_versionp\fP,
-	int *\fIminor_versionp\fP\^);
+	int *\fImajor_version_return\fP,
+	int *\fIminor_version_return\fP\^);
 .sp
 Bool XineramaIsActive \^(\^Display *\fIdpy\fP\^);
 .sp
@@ -55,13 +55,13 @@ XineramaScreenInfo * XineramaQueryScreens \^(\^Display *\fIdpy\fP,
 .SH ARGUMENTS
 .IP \fIdisplay\fP 1i
 Specifies the connection to the X server.
-.IP \fIevent_basep\fP 1i
+.IP \fIevent_base_return\fP 1i
 Specifies the return location for the assigned base event code
-.IP \fIerror_basep\fP 1i
+.IP \fIerror_base_return\fP 1i
 Specifies the return location for the assigned base error code
-.IP \fImajor_versionp\fP 1i
+.IP \fImajor_version_return\fP 1i
 Returns the major version supported by the server
-.IP \fIminor_versionp\fP 1i
+.IP \fIminor_version_return\fP 1i
 Returns the minor version supported by the server
 .IP \fInumber\fP 1i
 Returns the number of entries in the returned XineramaScreenInfo array.
@@ -78,18 +78,18 @@ into a single logical X screen.
 .LP
 The XineramaQueryExtension function queries the Xserver to determine the 
 availability of the Xinerama Extension. If the extension is available, the 
-return value is True, and event_base and error_base are set to the base event 
-number and base error number for the extension, respectively. Otherwise, the 
-return value is False, and the values of event_base and error_base are 
-undefined.
+return value is True, and event_base_return and error_base_return are set to
+the base event number and base error number for the extension, respectively.
+Otherwise, the return value is False, and the values of event_base_return and
+error_base_return are undefined.
 .sp
 
 .SS \fBXineramaQueryVersion()\fR
 
 .LP
 The XineramaQueryVersion function returns the version of the Xinerama extension
-implemented by the Xserver. The version is returned in major_versionp and 
-minor_versionp. The major version will be incremented for protocol 
+implemented by the Xserver. The version is returned in major_version_return
+and minor_version_return. The major version will be incremented for protocol
 incompatible changes, and the minor version will be incremented for small, 
 upwardly compatible changes.
 .LP