Update to libXmu 1.1.0. No functional change.

25 files changed, 28 insertions, 85 deletions

diff --git a/lib/libXmu/include/Makefile.am b/lib/libXmu/include/Makefile.am
index f28021f86..413dd5b87 100644
--- a/lib/libXmu/include/Makefile.am
+++ b/lib/libXmu/include/Makefile.am
@@ -21,4 +21,5 @@ xmuinclude_HEADERS = \
 	X11/Xmu/SysUtil.h \
 	X11/Xmu/WidgetNode.h \
 	X11/Xmu/WinUtil.h \
-	X11/Xmu/Xct.h
+	X11/Xmu/Xct.h \
+	X11/Xmu/WhitePoint.h
diff --git a/lib/libXmu/include/Makefile.in b/lib/libXmu/include/Makefile.in
index d3a102fe3..5ac160ddf 100644
--- a/lib/libXmu/include/Makefile.in
+++ b/lib/libXmu/include/Makefile.in
@@ -66,6 +66,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@
@@ -95,13 +96,25 @@ ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
+ENABLE_DOCS_FALSE = @ENABLE_DOCS_FALSE@
+ENABLE_DOCS_TRUE = @ENABLE_DOCS_TRUE@
 EXEEXT = @EXEEXT@
 F77 = @F77@
 FFLAGS = @FFLAGS@
 FILE_MAN_DIR = @FILE_MAN_DIR@
 FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
+FOP = @FOP@
 GREP = @GREP@
 HAS_SNPRINTF = @HAS_SNPRINTF@
+HAVE_FOP_FALSE = @HAVE_FOP_FALSE@
+HAVE_FOP_TRUE = @HAVE_FOP_TRUE@
+HAVE_STYLESHEETS_FALSE = @HAVE_STYLESHEETS_FALSE@
+HAVE_STYLESHEETS_TRUE = @HAVE_STYLESHEETS_TRUE@
+HAVE_XMLTO_FALSE = @HAVE_XMLTO_FALSE@
+HAVE_XMLTO_TEXT_FALSE = @HAVE_XMLTO_TEXT_FALSE@
+HAVE_XMLTO_TEXT_TRUE = @HAVE_XMLTO_TEXT_TRUE@
+HAVE_XMLTO_TRUE = @HAVE_XMLTO_TRUE@
+INSTALL_CMD = @INSTALL_CMD@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -126,6 +139,7 @@ MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
 MAKE_LINT_LIB_FALSE = @MAKE_LINT_LIB_FALSE@
 MAKE_LINT_LIB_TRUE = @MAKE_LINT_LIB_TRUE@
+MAN_SUBSTS = @MAN_SUBSTS@
 MISC_MAN_DIR = @MISC_MAN_DIR@
 MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
 NMEDIT = @NMEDIT@
@@ -143,11 +157,16 @@ SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
+STYLESHEET_SRCDIR = @STYLESHEET_SRCDIR@
 VERSION = @VERSION@
+XMLTO = @XMLTO@
 XMUU_CFLAGS = @XMUU_CFLAGS@
 XMUU_LIBS = @XMUU_LIBS@
 XMU_CFLAGS = @XMU_CFLAGS@
 XMU_LIBS = @XMU_LIBS@
+XORG_MAN_PAGE = @XORG_MAN_PAGE@
+XORG_SGML_PATH = @XORG_SGML_PATH@
+XSL_STYLESHEET = @XSL_STYLESHEET@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
@@ -168,7 +187,6 @@ build_os = @build_os@
 build_vendor = @build_vendor@
 datadir = @datadir@
 datarootdir = @datarootdir@
-distcleancheck_listfiles = @distcleancheck_listfiles@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
@@ -219,7 +237,8 @@ xmuinclude_HEADERS = \
 	X11/Xmu/SysUtil.h \
 	X11/Xmu/WidgetNode.h \
 	X11/Xmu/WinUtil.h \
-	X11/Xmu/Xct.h
+	X11/Xmu/Xct.h \
+	X11/Xmu/WhitePoint.h
 
 all: all-am
 
@@ -233,9 +252,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  include/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  include/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  include/Makefile
+	  $(AUTOMAKE) --foreign  include/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
diff --git a/lib/libXmu/include/X11/Xmu/Atoms.h b/lib/libXmu/include/X11/Xmu/Atoms.h
index f7b4c8f7e..3d8691025 100644
--- a/lib/libXmu/include/X11/Xmu/Atoms.h
+++ b/lib/libXmu/include/X11/Xmu/Atoms.h
@@ -1,5 +1,3 @@
-/* $Xorg: Atoms.h,v 1.4 2001/02/09 02:03:51 xorgcvs Exp $ */
-
 /* 
 
 Copyright 1988, 1998  The Open Group
@@ -25,7 +23,6 @@ used in advertising or otherwise to promote the sale, use or other dealings
 in this Software without prior written authorization from The Open Group.
 
 */
-/* $XFree86: xc/lib/Xmu/Atoms.h,v 1.6 2001/01/17 19:42:53 dawes Exp $ */
 
 /*
  * The interfaces described by this header file are for miscellaneous utilities
diff --git a/lib/libXmu/include/X11/Xmu/CharSet.h b/lib/libXmu/include/X11/Xmu/CharSet.h
index 32cebfeda..1ce9166a0 100644
--- a/lib/libXmu/include/X11/Xmu/CharSet.h
+++ b/lib/libXmu/include/X11/Xmu/CharSet.h
@@ -1,5 +1,3 @@
-/* $Xorg: CharSet.h,v 1.4 2001/02/09 02:03:51 xorgcvs Exp $ */
-
 /* 
 
 Copyright 1988, 1998  The Open Group
@@ -26,8 +24,6 @@ in this Software without prior written authorization from The Open Group.
 
 */
 
-/* $XFree86: xc/lib/Xmu/CharSet.h,v 1.7 2001/01/17 19:42:53 dawes Exp $ */
-
 /*
  * The interfaces described by this header file are for miscellaneous utilities
  * and are not part of the Xlib standard.
diff --git a/lib/libXmu/include/X11/Xmu/CloseHook.h b/lib/libXmu/include/X11/Xmu/CloseHook.h
index 1940a793b..2481ebf3e 100644
--- a/lib/libXmu/include/X11/Xmu/CloseHook.h
+++ b/lib/libXmu/include/X11/Xmu/CloseHook.h
@@ -1,5 +1,3 @@
-/* $Xorg: CloseHook.h,v 1.5 2001/02/09 02:03:51 xorgcvs Exp $ */
-
 /* 
 
 Copyright 1988, 1998  The Open Group
@@ -25,7 +23,6 @@ used in advertising or otherwise to promote the sale, use or other dealings
 in this Software without prior written authorization from The Open Group.
 
 */
-/* $XFree86: xc/lib/Xmu/CloseHook.h,v 1.6 2001/01/17 19:42:53 dawes Exp $ */
 
 /*
  * The interfaces described by this header file are for miscellaneous utilities
diff --git a/lib/libXmu/include/X11/Xmu/Converters.h b/lib/libXmu/include/X11/Xmu/Converters.h
index 11055d950..3779750c6 100644
--- a/lib/libXmu/include/X11/Xmu/Converters.h
+++ b/lib/libXmu/include/X11/Xmu/Converters.h
@@ -1,5 +1,3 @@
-/* $Xorg: Converters.h,v 1.5 2001/02/09 02:03:51 xorgcvs Exp $ */
-
 /*
  
 Copyright 1988, 1998  The Open Group
@@ -26,8 +24,6 @@ in this Software without prior written authorization from The Open Group.
 
 */
 
-/* $XFree86: xc/lib/Xmu/Converters.h,v 1.5 2001/01/17 19:42:53 dawes Exp $ */
-
 /*
  * The interfaces described by this header file are for miscellaneous utilities
  * and are not part of the Xlib standard.
diff --git a/lib/libXmu/include/X11/Xmu/CurUtil.h b/lib/libXmu/include/X11/Xmu/CurUtil.h
index 27ab18848..3524d7704 100644
--- a/lib/libXmu/include/X11/Xmu/CurUtil.h
+++ b/lib/libXmu/include/X11/Xmu/CurUtil.h
@@ -1,5 +1,3 @@
-/* $Xorg: CurUtil.h,v 1.4 2001/02/09 02:03:51 xorgcvs Exp $ */
-
 /*
  
 Copyright 1988, 1998  The Open Group
@@ -25,7 +23,6 @@ used in advertising or otherwise to promote the sale, use or other dealings
 in this Software without prior written authorization from The Open Group.
 
 */
-/* $XFree86: xc/lib/Xmu/CurUtil.h,v 1.5 2001/01/17 19:42:54 dawes Exp $ */
 
 /*
  * The interfaces described by this header file are for miscellaneous utilities
diff --git a/lib/libXmu/include/X11/Xmu/CvtCache.h b/lib/libXmu/include/X11/Xmu/CvtCache.h
index d9b967ab7..7441e2f2e 100644
--- a/lib/libXmu/include/X11/Xmu/CvtCache.h
+++ b/lib/libXmu/include/X11/Xmu/CvtCache.h
@@ -1,5 +1,3 @@
-/* $Xorg: CvtCache.h,v 1.4 2001/02/09 02:03:52 xorgcvs Exp $ */
-
 /*
  
 Copyright 1989, 1998  The Open Group
@@ -25,7 +23,6 @@ used in advertising or otherwise to promote the sale, use or other dealings
 in this Software without prior written authorization from The Open Group.
 
 */
-/* $XFree86: xc/lib/Xmu/CvtCache.h,v 1.6 2001/01/17 19:42:54 dawes Exp $ */
 
 /*
  *			       Public Interfaces
diff --git a/lib/libXmu/include/X11/Xmu/DisplayQue.h b/lib/libXmu/include/X11/Xmu/DisplayQue.h
index 9f9013c1e..b37a58133 100644
--- a/lib/libXmu/include/X11/Xmu/DisplayQue.h
+++ b/lib/libXmu/include/X11/Xmu/DisplayQue.h
@@ -1,5 +1,3 @@
-/* $Xorg: DisplayQue.h,v 1.4 2001/02/09 02:03:52 xorgcvs Exp $ */
-
 /*
 
 Copyright 1994, 1998  The Open Group
@@ -25,7 +23,6 @@ used in advertising or otherwise to promote the sale, use or other dealings
 in this Software without prior written authorization from The Open Group.
 
 */
-/* $XFree86: xc/lib/Xmu/DisplayQue.h,v 1.5 2001/01/17 19:42:54 dawes Exp $ */
 
 #ifndef _XMU_DISPLAYQUE_H_
 #define _XMU_DISPLAYQUE_H_
diff --git a/lib/libXmu/include/X11/Xmu/Drawing.h b/lib/libXmu/include/X11/Xmu/Drawing.h
index 9ffed3bab..91d764b77 100644
--- a/lib/libXmu/include/X11/Xmu/Drawing.h
+++ b/lib/libXmu/include/X11/Xmu/Drawing.h
@@ -1,5 +1,3 @@
-/* $Xorg: Drawing.h,v 1.5 2001/02/09 02:03:52 xorgcvs Exp $ */
-
 /*
  
 Copyright 1988, 1998  The Open Group
@@ -25,7 +23,6 @@ used in advertising or otherwise to promote the sale, use or other dealings
 in this Software without prior written authorization from The Open Group.
 
 */
-/* $XFree86: xc/lib/Xmu/Drawing.h,v 1.6 2001/12/14 19:55:42 dawes Exp $ */
 
 /*
  * The interfaces described by this header file are for miscellaneous utilities
diff --git a/lib/libXmu/include/X11/Xmu/Editres.h b/lib/libXmu/include/X11/Xmu/Editres.h
index 2a3f3e250..0c1ffe075 100644
--- a/lib/libXmu/include/X11/Xmu/Editres.h
+++ b/lib/libXmu/include/X11/Xmu/Editres.h
@@ -1,5 +1,3 @@
-/* $Xorg: Editres.h,v 1.4 2001/02/09 02:03:52 xorgcvs Exp $ */
-
 /*
 
 Copyright 1991, 1994, 1998  The Open Group
@@ -25,7 +23,6 @@ used in advertising or otherwise to promote the sale, use or other dealings
 in this Software without prior written authorization from The Open Group.
 
 */
-/* $XFree86: xc/lib/Xmu/Editres.h,v 1.5 2001/01/17 19:42:55 dawes Exp $ */
 
 #include <X11/Xfuncproto.h>
 
diff --git a/lib/libXmu/include/X11/Xmu/EditresP.h b/lib/libXmu/include/X11/Xmu/EditresP.h
index 886205bf2..6f7c739ab 100644
--- a/lib/libXmu/include/X11/Xmu/EditresP.h
+++ b/lib/libXmu/include/X11/Xmu/EditresP.h
@@ -1,5 +1,3 @@
-/* $Xorg: EditresP.h,v 1.4 2001/02/09 02:03:52 xorgcvs Exp $ */
-
 /*
 
 Copyright 1989, 1998  The Open Group
@@ -25,7 +23,6 @@ used in advertising or otherwise to promote the sale, use or other dealings
 in this Software without prior written authorization from The Open Group.
 
 */
-/* $XFree86: xc/lib/Xmu/EditresP.h,v 1.5 2001/01/17 19:42:55 dawes Exp $ */
 
 /*
  * Author:  Chris D. Peterson, MIT X Consortium
diff --git a/lib/libXmu/include/X11/Xmu/Error.h b/lib/libXmu/include/X11/Xmu/Error.h
index f992930ec..c69bf141e 100644
--- a/lib/libXmu/include/X11/Xmu/Error.h
+++ b/lib/libXmu/include/X11/Xmu/Error.h
@@ -1,5 +1,3 @@
-/* $Xorg: Error.h,v 1.5 2001/02/09 02:03:52 xorgcvs Exp $ */
-
 /*
  
 Copyright 1988, 1998  The Open Group
@@ -25,7 +23,6 @@ used in advertising or otherwise to promote the sale, use or other dealings
 in this Software without prior written authorization from The Open Group.
 
 */
-/* $XFree86: xc/lib/Xmu/Error.h,v 1.5 2001/01/17 19:42:55 dawes Exp $ */
 
 /*
  * The interfaces described by this header file are for miscellaneous utilities
diff --git a/lib/libXmu/include/X11/Xmu/ExtAgent.h b/lib/libXmu/include/X11/Xmu/ExtAgent.h
index b0caf3699..b30014012 100644
--- a/lib/libXmu/include/X11/Xmu/ExtAgent.h
+++ b/lib/libXmu/include/X11/Xmu/ExtAgent.h
@@ -1,5 +1,3 @@
-/* $Xorg: ExtAgent.h,v 1.5 2001/02/09 02:03:52 xorgcvs Exp $ */
-
 /*
 
 Copyright 1994,1998  The Open Group
@@ -25,7 +23,6 @@ used in advertising or otherwise to promote the sale, use or other dealings
 in this Software without prior written authorization from The Open Group.
 
 */
-/* $XFree86: xc/lib/Xmu/ExtAgent.h,v 1.5 2001/01/17 19:42:55 dawes Exp $ */
 
 #include <X11/Intrinsic.h>
 #include <X11/Xfuncproto.h>
diff --git a/lib/libXmu/include/X11/Xmu/Initer.h b/lib/libXmu/include/X11/Xmu/Initer.h
index 5e870af8c..2ba86e833 100644
--- a/lib/libXmu/include/X11/Xmu/Initer.h
+++ b/lib/libXmu/include/X11/Xmu/Initer.h
@@ -1,5 +1,3 @@
-/* $Xorg: Initer.h,v 1.5 2001/02/09 02:03:52 xorgcvs Exp $ */
-
 /*
  
 Copyright 1988, 1998  The Open Group
@@ -25,7 +23,6 @@ used in advertising or otherwise to promote the sale, use or other dealings
 in this Software without prior written authorization from The Open Group.
 
 */
-/* $XFree86: xc/lib/Xmu/Initer.h,v 1.5 2001/01/17 19:42:56 dawes Exp $ */
 
 /*
  * The interfaces described by this header file are for miscellaneous utilities
diff --git a/lib/libXmu/include/X11/Xmu/Lookup.h b/lib/libXmu/include/X11/Xmu/Lookup.h
index 3699a2719..e99b8b1e5 100644
--- a/lib/libXmu/include/X11/Xmu/Lookup.h
+++ b/lib/libXmu/include/X11/Xmu/Lookup.h
@@ -1,7 +1,3 @@
-/*
- * $XFree86$
- */
-
 /************************************************************
 
 Copyright 1999 by Thomas E. Dickey <dickey@clark.net>
diff --git a/lib/libXmu/include/X11/Xmu/Misc.h b/lib/libXmu/include/X11/Xmu/Misc.h
index b47fbba4b..650771b19 100644
--- a/lib/libXmu/include/X11/Xmu/Misc.h
+++ b/lib/libXmu/include/X11/Xmu/Misc.h
@@ -1,5 +1,3 @@
-/* $Xorg: Misc.h,v 1.4 2001/02/09 02:03:53 xorgcvs Exp $ */
-
 /*
 
 Copyright 1987, 1988, 1998  The Open Group
diff --git a/lib/libXmu/include/X11/Xmu/StdCmap.h b/lib/libXmu/include/X11/Xmu/StdCmap.h
index b268d073c..afad78f6d 100644
--- a/lib/libXmu/include/X11/Xmu/StdCmap.h
+++ b/lib/libXmu/include/X11/Xmu/StdCmap.h
@@ -1,5 +1,3 @@
-/* $Xorg: StdCmap.h,v 1.5 2001/02/09 02:03:53 xorgcvs Exp $ */
-
 /*
  
 Copyright 1988, 1998  The Open Group
@@ -25,7 +23,6 @@ used in advertising or otherwise to promote the sale, use or other dealings
 in this Software without prior written authorization from The Open Group.
 
 */
-/* $XFree86: xc/lib/Xmu/StdCmap.h,v 1.8 2001/01/23 17:38:14 keithp Exp $ */
 
 /*
  * The interfaces described by this header file are for miscellaneous utilities
diff --git a/lib/libXmu/include/X11/Xmu/StdSel.h b/lib/libXmu/include/X11/Xmu/StdSel.h
index f7c9452de..c61214dd9 100644
--- a/lib/libXmu/include/X11/Xmu/StdSel.h
+++ b/lib/libXmu/include/X11/Xmu/StdSel.h
@@ -1,5 +1,3 @@
-/* $Xorg: StdSel.h,v 1.5 2001/02/09 02:03:53 xorgcvs Exp $ */
-
 /*
  
 Copyright 1988, 1998  The Open Group
@@ -25,7 +23,6 @@ used in advertising or otherwise to promote the sale, use or other dealings
 in this Software without prior written authorization from The Open Group.
 
 */
-/* $XFree86: xc/lib/Xmu/StdSel.h,v 1.7 2001/01/17 19:42:56 dawes Exp $ */
 
 /*
  * The interfaces described by this header file are for miscellaneous utilities
diff --git a/lib/libXmu/include/X11/Xmu/SysUtil.h b/lib/libXmu/include/X11/Xmu/SysUtil.h
index 9f5b033ac..da5b189f4 100644
--- a/lib/libXmu/include/X11/Xmu/SysUtil.h
+++ b/lib/libXmu/include/X11/Xmu/SysUtil.h
@@ -1,5 +1,3 @@
-/* $Xorg: SysUtil.h,v 1.4 2001/02/09 02:03:53 xorgcvs Exp $ */
-
 /*
 
 Copyright 1989, 1998  The Open Group
@@ -25,7 +23,6 @@ used in advertising or otherwise to promote the sale, use or other dealings
 in this Software without prior written authorization from The Open Group.
 
 */
-/* $XFree86: xc/lib/Xmu/SysUtil.h,v 1.9 2001/12/14 19:55:55 dawes Exp $ */
 
 #ifndef _SYSUTIL_H_
 #define _SYSUTIL_H_
@@ -48,11 +45,7 @@ int XmuSnprintf
  _Xconst char		*fmt,
     ...
  )
-#if defined(__GNUC__) && \
-    ((__GNUC__ > 2) || ((__GNUC__ == 2) && (__GNUC_MINOR__ > 4)))
-__attribute((format(printf,3,4)))
-#endif
-;
+_X_ATTRIBUTE_PRINTF(3,4);
 #endif
 
 _XFUNCPROTOEND
diff --git a/lib/libXmu/include/X11/Xmu/WhitePoint.h b/lib/libXmu/include/X11/Xmu/WhitePoint.h
index a05bddd4a..9f41c4221 100644
--- a/lib/libXmu/include/X11/Xmu/WhitePoint.h
+++ b/lib/libXmu/include/X11/Xmu/WhitePoint.h
@@ -1,5 +1,3 @@
-/* $Xorg: WhitePoint.h,v 1.4 2001/02/09 02:03:53 xorgcvs Exp $ */
-
 /*
 
 Copyright 1991, 1994, 1998  The Open Group
diff --git a/lib/libXmu/include/X11/Xmu/WidgetNode.h b/lib/libXmu/include/X11/Xmu/WidgetNode.h
index 75050d253..f9d2cb57f 100644
--- a/lib/libXmu/include/X11/Xmu/WidgetNode.h
+++ b/lib/libXmu/include/X11/Xmu/WidgetNode.h
@@ -1,5 +1,3 @@
-/* $Xorg: WidgetNode.h,v 1.5 2001/02/09 02:03:53 xorgcvs Exp $ */
-
 /*
 
 Copyright 1990, 1998  The Open Group
@@ -25,7 +23,6 @@ used in advertising or otherwise to promote the sale, use or other dealings
 in this Software without prior written authorization from The Open Group.
 
 */
-/* $XFree86: xc/lib/Xmu/WidgetNode.h,v 1.5 2001/01/17 19:42:57 dawes Exp $ */
 
 /*
  * Author:  Jim Fulton, MIT X Consortium
diff --git a/lib/libXmu/include/X11/Xmu/WinUtil.h b/lib/libXmu/include/X11/Xmu/WinUtil.h
index 0445bcfa8..c3d11a86a 100644
--- a/lib/libXmu/include/X11/Xmu/WinUtil.h
+++ b/lib/libXmu/include/X11/Xmu/WinUtil.h
@@ -1,5 +1,3 @@
-/* $Xorg: WinUtil.h,v 1.4 2001/02/09 02:03:53 xorgcvs Exp $ */
-
 /*
  
 Copyright 1988, 1998  The Open Group
@@ -25,7 +23,6 @@ used in advertising or otherwise to promote the sale, use or other dealings
 in this Software without prior written authorization from The Open Group.
 
 */
-/* $XFree86: xc/lib/Xmu/WinUtil.h,v 1.6 2001/01/17 19:42:57 dawes Exp $ */
 
 /*
  * The interfaces described by this header file are for miscellaneous utilities
diff --git a/lib/libXmu/include/X11/Xmu/Xct.h b/lib/libXmu/include/X11/Xmu/Xct.h
index b06644ae0..514ad7fea 100644
--- a/lib/libXmu/include/X11/Xmu/Xct.h
+++ b/lib/libXmu/include/X11/Xmu/Xct.h
@@ -1,5 +1,3 @@
-/* $Xorg: Xct.h,v 1.4 2001/02/09 02:03:53 xorgcvs Exp $ */
-
 /*
 
 Copyright 1989, 1998  The Open Group
@@ -25,7 +23,6 @@ used in advertising or otherwise to promote the sale, use or other dealings
 in this Software without prior written authorization from The Open Group.
 
 */
-/* $XFree86: xc/lib/Xmu/Xct.h,v 1.6 2001/01/17 19:42:58 dawes Exp $ */
 
 #ifndef _Xct_h
 #define _Xct_h
diff --git a/lib/libXmu/include/X11/Xmu/Xmu.h b/lib/libXmu/include/X11/Xmu/Xmu.h
index c503a41b8..ad7948846 100644
--- a/lib/libXmu/include/X11/Xmu/Xmu.h
+++ b/lib/libXmu/include/X11/Xmu/Xmu.h
@@ -1,5 +1,3 @@
-/* $Xorg: Xmu.h,v 1.4 2001/02/09 02:03:53 xorgcvs Exp $ */
-
 /* 
 
 Copyright 1988, 1998  The Open Group
@@ -25,7 +23,6 @@ used in advertising or otherwise to promote the sale, use or other dealings
 in this Software without prior written authorization from The Open Group.
 
 */
-/* $XFree86: xc/lib/Xmu/Xmu.h,v 1.9 2001/12/14 19:55:59 dawes Exp $ */
 
 /*
  * The interfaces described by this header file are for miscellaneous utilities
@@ -35,6 +32,7 @@ in this Software without prior written authorization from The Open Group.
 #ifndef _XMU_H_
 #define _XMU_H_
 
+#include <X11/Xfuncproto.h>
 #include <X11/Intrinsic.h>
 #include <X11/Xmu/Atoms.h>		/* _XA_... */
 #include <X11/Xmu/CharSet.h>		/* CopyISOLatin1Lowered */
@@ -117,11 +115,7 @@ XmuScanline *XmuScanlineXorSegment(XmuScanline*, XmuSegment*);
 
 #ifndef _SYSUTIL_H_
 int XmuSnprintf(char *str, int size, _Xconst char *fmt, ...)
-#if defined(__GNUC__) && \
-    ((__GNUC__ > 2) || ((__GNUC__ == 2) && (__GNUC_MINOR__ > 4)))
-__attribute((format(printf,3,4)))
-#endif
-;
+    _X_ATTRIBUTE_PRINTF(3,4);
 #endif
 
 #endif /* _XMU_H_ */