From 272e57235cd60a2e65ac8258d96a02eb3939b687 Mon Sep 17 00:00:00 2001 From: marha Date: Fri, 25 Mar 2011 10:41:05 +0000 Subject: git update until 25 Mar 2011 xserver fontconfig glproto libXau libXft libXmu libfontenc libxcb mesa mkfontscale pixman randrproto xkeyboard-config xtrans xwininfo updated following packages: xproto-7.0.21 xineramaproto-1.2.1 libXt-1.1.1 libxkbfile-1.0.7 libXpm-3.5.9 libXfont-1.4.3 libXaw-1.0.9 bdftopcf-1.0.3 encodings-1.0.4 fixesproto-5.0 font-adobe-100dpi-1.0.3 font-adobe-75dpi-1.0.3 font-adobe-utopia-100dpi-1.0.4 font-adobe-utopia-75dpi-1.0.4 font-adobe-utopia-type1-1.0.4 font-alias-1.0.3 font-arabic-misc-1.0.3 font-bh-100dpi-1.0.3 font-bh-75dpi-1.0.3 font-bh-lucidatypewriter-100dpi-1.0.3 font-bh-lucidatypewriter-75dpi-1.0.3 font-bh-ttf-1.0.3 font-bh-type1-1.0.3 font-bitstream-100dpi-1.0.3 font-bitstream-75dpi-1.0.3 font-bitstream-speedo-1.0.2 font-bitstream-type1-1.0.3 font-cronyx-cyrillic-1.0.3 font-cursor-misc-1.0.3 font-daewoo-misc-1.0.3 font-dec-misc-1.0.3 font-ibm-type1-1.0.3 font-isas-misc-1.0.3 font-jis-misc-1.0.3 font-micro-misc-1.0.3 font-misc-cyrillic-1.0.3 font-misc-ethiopic-1.0.3 font-misc-meltho-1.0.3 font-misc-misc-1.1.2 font-mutt-misc-1.0.3 font-schumacher-misc-1.1.2 font-screen-cyrillic-1.0.4 font-sony-misc-1.0.3 font-sun-misc-1.0.3 font-util-1.2.0 font-winitzki-cyrillic-1.0.3 font-xfree86-type1-1.0.4 --- libXmu/include/X11/Xmu/Atoms.h | 3 --- libXmu/include/X11/Xmu/CharSet.h | 4 ---- libXmu/include/X11/Xmu/CloseHook.h | 3 --- libXmu/include/X11/Xmu/Converters.h | 4 ---- libXmu/include/X11/Xmu/CurUtil.h | 3 --- libXmu/include/X11/Xmu/CvtCache.h | 3 --- libXmu/include/X11/Xmu/DisplayQue.h | 3 --- libXmu/include/X11/Xmu/Drawing.h | 3 --- libXmu/include/X11/Xmu/Editres.h | 3 --- libXmu/include/X11/Xmu/EditresP.h | 3 --- libXmu/include/X11/Xmu/Error.h | 3 --- libXmu/include/X11/Xmu/ExtAgent.h | 3 --- libXmu/include/X11/Xmu/Initer.h | 3 --- libXmu/include/X11/Xmu/Lookup.h | 4 ---- libXmu/include/X11/Xmu/Misc.h | 2 -- libXmu/include/X11/Xmu/StdCmap.h | 3 --- libXmu/include/X11/Xmu/StdSel.h | 3 --- libXmu/include/X11/Xmu/SysUtil.h | 9 +-------- libXmu/include/X11/Xmu/WhitePoint.h | 2 -- libXmu/include/X11/Xmu/WidgetNode.h | 3 --- libXmu/include/X11/Xmu/WinUtil.h | 3 --- libXmu/include/X11/Xmu/Xct.h | 3 --- libXmu/include/X11/Xmu/Xmu.h | 10 ++-------- 23 files changed, 3 insertions(+), 80 deletions(-) (limited to 'libXmu/include/X11/Xmu') diff --git a/libXmu/include/X11/Xmu/Atoms.h b/libXmu/include/X11/Xmu/Atoms.h index f7b4c8f7e..3d8691025 100644 --- a/libXmu/include/X11/Xmu/Atoms.h +++ b/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/libXmu/include/X11/Xmu/CharSet.h b/libXmu/include/X11/Xmu/CharSet.h index 32cebfeda..1ce9166a0 100644 --- a/libXmu/include/X11/Xmu/CharSet.h +++ b/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/libXmu/include/X11/Xmu/CloseHook.h b/libXmu/include/X11/Xmu/CloseHook.h index 1940a793b..2481ebf3e 100644 --- a/libXmu/include/X11/Xmu/CloseHook.h +++ b/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/libXmu/include/X11/Xmu/Converters.h b/libXmu/include/X11/Xmu/Converters.h index 11055d950..3779750c6 100644 --- a/libXmu/include/X11/Xmu/Converters.h +++ b/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/libXmu/include/X11/Xmu/CurUtil.h b/libXmu/include/X11/Xmu/CurUtil.h index 27ab18848..3524d7704 100644 --- a/libXmu/include/X11/Xmu/CurUtil.h +++ b/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/libXmu/include/X11/Xmu/CvtCache.h b/libXmu/include/X11/Xmu/CvtCache.h index d9b967ab7..7441e2f2e 100644 --- a/libXmu/include/X11/Xmu/CvtCache.h +++ b/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/libXmu/include/X11/Xmu/DisplayQue.h b/libXmu/include/X11/Xmu/DisplayQue.h index 9f9013c1e..b37a58133 100644 --- a/libXmu/include/X11/Xmu/DisplayQue.h +++ b/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/libXmu/include/X11/Xmu/Drawing.h b/libXmu/include/X11/Xmu/Drawing.h index 9ffed3bab..91d764b77 100644 --- a/libXmu/include/X11/Xmu/Drawing.h +++ b/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/libXmu/include/X11/Xmu/Editres.h b/libXmu/include/X11/Xmu/Editres.h index 2a3f3e250..0c1ffe075 100644 --- a/libXmu/include/X11/Xmu/Editres.h +++ b/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 diff --git a/libXmu/include/X11/Xmu/EditresP.h b/libXmu/include/X11/Xmu/EditresP.h index 886205bf2..6f7c739ab 100644 --- a/libXmu/include/X11/Xmu/EditresP.h +++ b/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/libXmu/include/X11/Xmu/Error.h b/libXmu/include/X11/Xmu/Error.h index f992930ec..c69bf141e 100644 --- a/libXmu/include/X11/Xmu/Error.h +++ b/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/libXmu/include/X11/Xmu/ExtAgent.h b/libXmu/include/X11/Xmu/ExtAgent.h index b0caf3699..b30014012 100644 --- a/libXmu/include/X11/Xmu/ExtAgent.h +++ b/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 #include diff --git a/libXmu/include/X11/Xmu/Initer.h b/libXmu/include/X11/Xmu/Initer.h index 5e870af8c..2ba86e833 100644 --- a/libXmu/include/X11/Xmu/Initer.h +++ b/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/libXmu/include/X11/Xmu/Lookup.h b/libXmu/include/X11/Xmu/Lookup.h index 3699a2719..e99b8b1e5 100644 --- a/libXmu/include/X11/Xmu/Lookup.h +++ b/libXmu/include/X11/Xmu/Lookup.h @@ -1,7 +1,3 @@ -/* - * $XFree86$ - */ - /************************************************************ Copyright 1999 by Thomas E. Dickey diff --git a/libXmu/include/X11/Xmu/Misc.h b/libXmu/include/X11/Xmu/Misc.h index b47fbba4b..650771b19 100644 --- a/libXmu/include/X11/Xmu/Misc.h +++ b/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/libXmu/include/X11/Xmu/StdCmap.h b/libXmu/include/X11/Xmu/StdCmap.h index b268d073c..afad78f6d 100644 --- a/libXmu/include/X11/Xmu/StdCmap.h +++ b/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/libXmu/include/X11/Xmu/StdSel.h b/libXmu/include/X11/Xmu/StdSel.h index f7c9452de..c61214dd9 100644 --- a/libXmu/include/X11/Xmu/StdSel.h +++ b/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/libXmu/include/X11/Xmu/SysUtil.h b/libXmu/include/X11/Xmu/SysUtil.h index 9f5b033ac..da5b189f4 100644 --- a/libXmu/include/X11/Xmu/SysUtil.h +++ b/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/libXmu/include/X11/Xmu/WhitePoint.h b/libXmu/include/X11/Xmu/WhitePoint.h index a05bddd4a..9f41c4221 100644 --- a/libXmu/include/X11/Xmu/WhitePoint.h +++ b/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/libXmu/include/X11/Xmu/WidgetNode.h b/libXmu/include/X11/Xmu/WidgetNode.h index 75050d253..f9d2cb57f 100644 --- a/libXmu/include/X11/Xmu/WidgetNode.h +++ b/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/libXmu/include/X11/Xmu/WinUtil.h b/libXmu/include/X11/Xmu/WinUtil.h index 0445bcfa8..c3d11a86a 100644 --- a/libXmu/include/X11/Xmu/WinUtil.h +++ b/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/libXmu/include/X11/Xmu/Xct.h b/libXmu/include/X11/Xmu/Xct.h index b06644ae0..514ad7fea 100644 --- a/libXmu/include/X11/Xmu/Xct.h +++ b/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/libXmu/include/X11/Xmu/Xmu.h b/libXmu/include/X11/Xmu/Xmu.h index c503a41b8..ad7948846 100644 --- a/libXmu/include/X11/Xmu/Xmu.h +++ b/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 #include #include /* _XA_... */ #include /* 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_ */ -- cgit v1.2.3