Janitor: ansification, make distcheck, compiler warnings.

5 files changed, 54 insertions, 14 deletions

diff --git a/.gitignore b/.gitignore
index c79a22f..5a1f04c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,5 @@
+.deps
+.libs
 aclocal.m4
 autom4te.cache
 config.guess
@@ -19,3 +21,10 @@ mkinstalldirs
 stamp-h1
 xinerama.pc
 *~
+*.3
+*.o
+*.la
+*.lo
+libXinerama-*.tar.*
+ChangeLog
+tags
diff --git a/Makefile.am b/Makefile.am
index e02c660..9eeb5e2 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -24,13 +24,13 @@ SUBDIRS = src man
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = xinerama.pc
 
-EXTRA_DIST = xinerama.pc.in autogen.sh ChangeLog
+EXTRA_DIST = xinerama.pc.in ChangeLog
 MAINTAINERCLEANFILES = ChangeLog
 
 .PHONY: ChangeLog
 
 ChangeLog:
-	(GIT_DIR=$(top_srcdir)/.git git-log > .changelog.tmp && mv .changelog.tmp ChangeLog; rm -f .changelog.tmp) || (touch ChangeLog; echo 'git directory not found: installing possibly empty changelog.' >&2)
+	$(CHANGELOG_CMD)
 
 dist-hook: ChangeLog
 
diff --git a/configure.ac b/configure.ac
index 8fc368c..af5fbf4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -26,19 +26,19 @@ AC_INIT(libXinerama, 1.0.3, [https://bugs.freedesktop.org/enter_bug.cgi?product=
 AM_INIT_AUTOMAKE([dist-bzip2])
 AM_MAINTAINER_MODE
 
+# Require xorg-macros: XORG_CWARNFLAGS, XORG_CHANGELOG, XORG_WITH_LINT
+m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.2 or later before running autoconf/autogen])])
+XORG_MACROS_VERSION(1.2)
 AM_CONFIG_HEADER(config.h)
 
-# Require xorg-macros version 1.1.0 or newer for XORG_WITH_LINT macro
-m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.1 or later])])
-XORG_MACROS_VERSION(1.1)
-
 # Check for progs
 AC_PROG_CC
 AC_PROG_LIBTOOL
+XORG_CWARNFLAGS
 
 # Check for dependencies
 PKG_CHECK_MODULES(XINERAMA, x11 xext xextproto xineramaproto)
-
+XINERAMA_CFLAGS="$CWARNFLAGS $XINERAMA_CFLAGS"
 AC_SUBST(XINERAMA_CFLAGS)
 AC_SUBST(XINERAMA_LIBS)
 
@@ -49,6 +49,7 @@ LINT_FLAGS="${LINT_FLAGS} ${XINERAMA_CFLAGS}"
 XORG_CHECK_MALLOC_ZERO
 XORG_MANPAGE_SECTIONS
 XORG_RELEASE_VERSION
+XORG_CHANGELOG
 
 AC_OUTPUT([Makefile
 	   src/Makefile
diff --git a/include/X11/extensions/panoramiXext.h b/include/X11/extensions/panoramiXext.h
index 280efc5..82682b8 100644
--- a/include/X11/extensions/panoramiXext.h
+++ b/include/X11/extensions/panoramiXext.h
@@ -28,6 +28,9 @@ Equipment Corporation.
 
 /* THIS IS NOT AN X PROJECT TEAM SPECIFICATION */
 
+#ifndef _panoramiXext_h
+#define _panoramiXext_h
+
 #define PANORAMIX_MAJOR_VERSION         1       /* current version number */
 #define PANORAMIX_MINOR_VERSION         1
 
@@ -41,6 +44,39 @@ typedef struct {
     XID     eventMask;      /* selected events for this client */
 } XPanoramiXInfo;    
 
+extern Bool XPanoramiXQueryExtension (
+    Display *		/* dpy */,
+    int *		/* event_base_return */,
+    int *		/* error_base_return */
+);
+
+extern Status XPanoramiXQueryVersion(
+    Display *		/* dpy */,
+    int *		/* major_version_return */,
+    int *		/* minor_version_return */
+);
+
 extern XPanoramiXInfo *XPanoramiXAllocInfo (
     void
-);        
+);
+
+extern Status XPanoramiXGetState (
+    Display *		/* dpy */,
+    Drawable		/* drawable */,
+    XPanoramiXInfo *	/* panoramiX_info */
+);
+
+extern Status XPanoramiXGetScreenCount (
+    Display *		/* dpy */,
+    Drawable		/* drawable */,
+    XPanoramiXInfo *	/* panoramiX_info */
+);
+
+extern Status XPanoramiXGetScreenSize (
+    Display *		/* dpy */,
+    Drawable		/* drawable */,
+    int			/* screen_num */,
+    XPanoramiXInfo *	/* panoramiX_info */
+);
+
+#endif /* _panoramiXext_h */
diff --git a/src/.gitignore b/src/.gitignore
deleted file mode 100644
index 3f6f09d..0000000
--- a/src/.gitignore
+++ /dev/null
@@ -1,6 +0,0 @@
-.deps
-.libs
-libXinerama.la
-*.lo
-Makefile
-Makefile.in