diff options
| author | Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de> | 2004-03-17 20:29:07 +0000 |
|---|---|---|
| committer | Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de> | 2004-03-17 20:29:07 +0000 |
| commit | d6b3eddcd9005ac023e365296cdd5ba31fc4aa0a (patch) | |
| tree | bff8cdecb3e4203ab6500efa529e0d1e0b05ea6d | |
| parent | ed7fe05e757aea9a8f90c979d315e4b66ed99f91 (diff) | |
merge with XORG-RELEASE-1 (tag XORG-CYGWIN-LAST-MERGE)CYGWIN-RELEASE-1-MERGECYGWIN-PRE-6_8_0-MERGECYGWIN-HEAD-MERGECYGWIN-HEAD-LAST-MERGE
66 files changed, 84 insertions, 70 deletions
diff --git a/include/X11/Xmu/Atoms.h b/include/X11/Xmu/Atoms.h index 64b6b08..f7b4c8f 100644 --- a/include/X11/Xmu/Atoms.h +++ b/include/X11/Xmu/Atoms.h @@ -25,7 +25,7 @@ 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.7 2001/12/14 19:55:33 dawes Exp $ */ +/* $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/include/X11/Xmu/CharSet.h b/include/X11/Xmu/CharSet.h index dfecf45..32cebfe 100644 --- a/include/X11/Xmu/CharSet.h +++ b/include/X11/Xmu/CharSet.h @@ -26,7 +26,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xmu/CharSet.h,v 1.8 2001/12/14 19:55:33 dawes Exp $ */ +/* $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 diff --git a/include/X11/Xmu/CloseHook.h b/include/X11/Xmu/CloseHook.h index 971a763..1940a79 100644 --- a/include/X11/Xmu/CloseHook.h +++ b/include/X11/Xmu/CloseHook.h @@ -25,7 +25,7 @@ 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.7 2001/12/14 19:55:35 dawes Exp $ */ +/* $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/include/X11/Xmu/Converters.h b/include/X11/Xmu/Converters.h index fa1be53..11055d9 100644 --- a/include/X11/Xmu/Converters.h +++ b/include/X11/Xmu/Converters.h @@ -26,7 +26,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xmu/Converters.h,v 1.6 2001/12/14 19:55:35 dawes Exp $ */ +/* $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 diff --git a/include/X11/Xmu/CurUtil.h b/include/X11/Xmu/CurUtil.h index f819013..27ab188 100644 --- a/include/X11/Xmu/CurUtil.h +++ b/include/X11/Xmu/CurUtil.h @@ -25,7 +25,7 @@ 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.6 2001/12/14 19:55:38 dawes Exp $ */ +/* $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/include/X11/Xmu/CvtCache.h b/include/X11/Xmu/CvtCache.h index 06cf162..d9b967a 100644 --- a/include/X11/Xmu/CvtCache.h +++ b/include/X11/Xmu/CvtCache.h @@ -25,7 +25,7 @@ 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.7 2001/12/14 19:55:39 dawes Exp $ */ +/* $XFree86: xc/lib/Xmu/CvtCache.h,v 1.6 2001/01/17 19:42:54 dawes Exp $ */ /* * Public Interfaces diff --git a/include/X11/Xmu/DisplayQue.h b/include/X11/Xmu/DisplayQue.h index 65c566e..9f9013c 100644 --- a/include/X11/Xmu/DisplayQue.h +++ b/include/X11/Xmu/DisplayQue.h @@ -25,7 +25,7 @@ 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.6 2001/12/14 19:55:40 dawes Exp $ */ +/* $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/include/X11/Xmu/Drawing.h b/include/X11/Xmu/Drawing.h index ad62eb7..9ffed3b 100644 --- a/include/X11/Xmu/Drawing.h +++ b/include/X11/Xmu/Drawing.h @@ -25,7 +25,7 @@ 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.7 2003/11/17 22:20:22 dawes Exp $ */ +/* $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/include/X11/Xmu/Editres.h b/include/X11/Xmu/Editres.h index 2b2eddb..2a3f3e2 100644 --- a/include/X11/Xmu/Editres.h +++ b/include/X11/Xmu/Editres.h @@ -25,7 +25,7 @@ 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.6 2001/12/14 19:55:43 dawes Exp $ */ +/* $XFree86: xc/lib/Xmu/Editres.h,v 1.5 2001/01/17 19:42:55 dawes Exp $ */ #include <X11/Xfuncproto.h> diff --git a/include/X11/Xmu/EditresP.h b/include/X11/Xmu/EditresP.h index b65b1c1..886205b 100644 --- a/include/X11/Xmu/EditresP.h +++ b/include/X11/Xmu/EditresP.h @@ -25,7 +25,7 @@ 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.6 2001/12/14 19:55:44 dawes Exp $ */ +/* $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/include/X11/Xmu/Error.h b/include/X11/Xmu/Error.h index b8d6d58..f992930 100644 --- a/include/X11/Xmu/Error.h +++ b/include/X11/Xmu/Error.h @@ -25,7 +25,7 @@ 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.6 2001/12/14 19:55:45 dawes Exp $ */ +/* $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/include/X11/Xmu/ExtAgent.h b/include/X11/Xmu/ExtAgent.h index 78e3495..b0caf36 100644 --- a/include/X11/Xmu/ExtAgent.h +++ b/include/X11/Xmu/ExtAgent.h @@ -25,7 +25,7 @@ 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.6 2001/12/14 19:55:45 dawes Exp $ */ +/* $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/include/X11/Xmu/Initer.h b/include/X11/Xmu/Initer.h index 5153237..5e870af 100644 --- a/include/X11/Xmu/Initer.h +++ b/include/X11/Xmu/Initer.h @@ -25,7 +25,7 @@ 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.6 2001/12/14 19:55:46 dawes Exp $ */ +/* $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/include/X11/Xmu/Lookup.h b/include/X11/Xmu/Lookup.h index 88ca4d4..3699a27 100644 --- a/include/X11/Xmu/Lookup.h +++ b/include/X11/Xmu/Lookup.h @@ -1,5 +1,5 @@ /* - * $XFree86: xc/lib/Xmu/Lookup.h,v 1.1 1999/03/21 07:34:38 dawes Exp $ + * $XFree86$ */ /************************************************************ diff --git a/include/X11/Xmu/StdCmap.h b/include/X11/Xmu/StdCmap.h index 649907a..b268d07 100644 --- a/include/X11/Xmu/StdCmap.h +++ b/include/X11/Xmu/StdCmap.h @@ -25,7 +25,7 @@ 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.9 2001/12/14 19:55:49 dawes Exp $ */ +/* $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/include/X11/Xmu/StdSel.h b/include/X11/Xmu/StdSel.h index ba6513f..f7c9452 100644 --- a/include/X11/Xmu/StdSel.h +++ b/include/X11/Xmu/StdSel.h @@ -25,7 +25,7 @@ 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.8 2001/12/14 19:55:50 dawes Exp $ */ +/* $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/include/X11/Xmu/SysUtil.h b/include/X11/Xmu/SysUtil.h index 0f24a89..9f5b033 100644 --- a/include/X11/Xmu/SysUtil.h +++ b/include/X11/Xmu/SysUtil.h @@ -47,7 +47,12 @@ int XmuSnprintf int size, _Xconst char *fmt, ... - ); + ) +#if defined(__GNUC__) && \ + ((__GNUC__ > 2) || ((__GNUC__ == 2) && (__GNUC_MINOR__ > 4))) +__attribute((format(printf,3,4))) +#endif +; #endif _XFUNCPROTOEND diff --git a/include/X11/Xmu/WidgetNode.h b/include/X11/Xmu/WidgetNode.h index a717544..75050d2 100644 --- a/include/X11/Xmu/WidgetNode.h +++ b/include/X11/Xmu/WidgetNode.h @@ -25,7 +25,7 @@ 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.6 2001/12/14 19:55:58 dawes Exp $ */ +/* $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/include/X11/Xmu/WinUtil.h b/include/X11/Xmu/WinUtil.h index 850cbfa..0445bcf 100644 --- a/include/X11/Xmu/WinUtil.h +++ b/include/X11/Xmu/WinUtil.h @@ -25,7 +25,7 @@ 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.7 2001/12/14 19:55:58 dawes Exp $ */ +/* $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/include/X11/Xmu/Xct.h b/include/X11/Xmu/Xct.h index 2a80e9d..b06644a 100644 --- a/include/X11/Xmu/Xct.h +++ b/include/X11/Xmu/Xct.h @@ -25,7 +25,7 @@ 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.7 2001/12/14 19:55:59 dawes Exp $ */ +/* $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/include/X11/Xmu/Xmu.h b/include/X11/Xmu/Xmu.h index 0959249..c503a41 100644 --- a/include/X11/Xmu/Xmu.h +++ b/include/X11/Xmu/Xmu.h @@ -116,7 +116,12 @@ XmuScanline *XmuScanlineXorSegment(XmuScanline*, XmuSegment*); #endif /* notdef */ #ifndef _SYSUTIL_H_ -int XmuSnprintf(char *str, int size, _Xconst char *fmt, ...); +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 +; #endif #endif /* _XMU_H_ */ diff --git a/src/AllCmap.c b/src/AllCmap.c index 384d068..4315df0 100644 --- a/src/AllCmap.c +++ b/src/AllCmap.c @@ -25,7 +25,7 @@ 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/AllCmap.c,v 1.8 2001/12/14 19:55:32 dawes Exp $ */ +/* $XFree86: xc/lib/Xmu/AllCmap.c,v 1.7 2001/01/17 19:42:53 dawes Exp $ */ #include <stdio.h> #include <X11/Xlib.h> diff --git a/src/Atoms.c b/src/Atoms.c index 1d696cd..7a8cdd2 100644 --- a/src/Atoms.c +++ b/src/Atoms.c @@ -25,7 +25,7 @@ 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.c,v 3.8 2001/12/14 19:55:33 dawes Exp $ */ +/* $XFree86: xc/lib/Xmu/Atoms.c,v 3.7 2001/07/25 15:04:50 dawes Exp $ */ /* * This file contains routines to cache atoms, avoiding multiple diff --git a/src/ClientWin.c b/src/ClientWin.c index 48c956d..5b4eccd 100644 --- a/src/ClientWin.c +++ b/src/ClientWin.c @@ -25,7 +25,7 @@ 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/ClientWin.c,v 1.8 2002/11/27 20:54:49 tsi Exp $ */ +/* $XFree86: xc/lib/Xmu/ClientWin.c,v 1.7 2001/12/14 19:55:34 dawes Exp $ */ #include <X11/Xlib.h> #include <X11/Xatom.h> @@ -24,7 +24,7 @@ * dealings in this Software without prior written authorization from the * XFree86 Project. */ -/* $XFree86: xc/lib/Xmu/Clip.c,v 1.2 1999/08/15 13:00:44 dawes Exp $ */ +/* $XFree86: xc/lib/Xmu/Clip.c,v 1.1 1998/08/16 10:25:03 dawes Exp $ */ #include <stdlib.h> diff --git a/src/CloseHook.c b/src/CloseHook.c index c3efd6e..2b1bf60 100644 --- a/src/CloseHook.c +++ b/src/CloseHook.c @@ -24,7 +24,7 @@ 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.c,v 3.6 2001/12/14 19:55:35 dawes Exp $ */ +/* $XFree86: xc/lib/Xmu/CloseHook.c,v 3.5 2001/07/25 15:04:50 dawes Exp $ */ /* * CloseDisplayHook package - provide callback on XCloseDisplay diff --git a/src/CmapAlloc.c b/src/CmapAlloc.c index c1cd680..38f3a4c 100644 --- a/src/CmapAlloc.c +++ b/src/CmapAlloc.c @@ -25,7 +25,7 @@ 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/CmapAlloc.c,v 1.7 2001/12/14 19:55:35 dawes Exp $ */ +/* $XFree86: xc/lib/Xmu/CmapAlloc.c,v 1.6 2001/01/17 19:42:53 dawes Exp $ */ /* * Author: Donna Converse, MIT X Consortium diff --git a/src/CrCmap.c b/src/CrCmap.c index 1c017a6..7ed8b81 100644 --- a/src/CrCmap.c +++ b/src/CrCmap.c @@ -25,7 +25,7 @@ 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/CrCmap.c,v 3.7 2001/12/14 19:55:36 dawes Exp $ */ +/* $XFree86: xc/lib/Xmu/CrCmap.c,v 3.6 2001/01/17 19:42:53 dawes Exp $ */ /* * Author: Donna Converse, MIT X Consortium diff --git a/src/CrPixFBit.c b/src/CrPixFBit.c index be0fa06..9d3bef6 100644 --- a/src/CrPixFBit.c +++ b/src/CrPixFBit.c @@ -25,7 +25,7 @@ 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/CrPixFBit.c,v 1.7 2001/12/14 19:55:37 dawes Exp $ */ +/* $XFree86: xc/lib/Xmu/CrPixFBit.c,v 1.6 2001/01/17 19:42:53 dawes Exp $ */ /* * This file contains miscellaneous utility routines and is not part of the diff --git a/src/CursorName.c b/src/CursorName.c index 40bad95..2106373 100644 --- a/src/CursorName.c +++ b/src/CursorName.c @@ -25,7 +25,7 @@ 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/CursorName.c,v 3.8 2002/09/18 17:11:42 tsi Exp $ */ +/* $XFree86: xc/lib/Xmu/CursorName.c,v 3.7tsi Exp $ */ #include <X11/Xmu/CharSet.h> #include <X11/Xmu/CurUtil.h> diff --git a/src/CvtCache.c b/src/CvtCache.c index b9e9153..8075020 100644 --- a/src/CvtCache.c +++ b/src/CvtCache.c @@ -25,7 +25,7 @@ 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.c,v 3.7 2001/12/14 19:55:39 dawes Exp $ */ +/* $XFree86: xc/lib/Xmu/CvtCache.c,v 3.6 2001/08/23 00:03:21 dawes Exp $ */ /* * Author: Jim Fulton, MIT X Consortium diff --git a/src/CvtStdSel.c b/src/CvtStdSel.c index 3020ee0..f9018fe 100644 --- a/src/CvtStdSel.c +++ b/src/CvtStdSel.c @@ -25,7 +25,7 @@ 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/CvtStdSel.c,v 3.20 2001/12/14 19:55:39 dawes Exp $ */ +/* $XFree86: xc/lib/Xmu/CvtStdSel.c,v 3.19 2001/11/21 16:22:59 tsi Exp $ */ /* * This file contains routines to handle common selection targets. diff --git a/src/DefErrMsg.c b/src/DefErrMsg.c index f948463..cbc4450 100644 --- a/src/DefErrMsg.c +++ b/src/DefErrMsg.c @@ -25,7 +25,7 @@ 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/DefErrMsg.c,v 1.8 2001/12/14 19:55:39 dawes Exp $ */ +/* $XFree86: xc/lib/Xmu/DefErrMsg.c,v 1.7 2001/01/17 19:42:54 dawes Exp $ */ #include <stdio.h> #define NEED_EVENTS diff --git a/src/DelCmap.c b/src/DelCmap.c index 02c73e6..588878d 100644 --- a/src/DelCmap.c +++ b/src/DelCmap.c @@ -25,7 +25,7 @@ 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/DelCmap.c,v 1.7 2001/12/14 19:55:40 dawes Exp $ */ +/* $XFree86: xc/lib/Xmu/DelCmap.c,v 1.6 2001/01/17 19:42:54 dawes Exp $ */ /* * Author: Donna Converse, MIT X Consortium diff --git a/src/DisplayQue.c b/src/DisplayQue.c index 9716895..93c3a13 100644 --- a/src/DisplayQue.c +++ b/src/DisplayQue.c @@ -25,7 +25,7 @@ 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.c,v 3.5 2001/12/14 19:55:40 dawes Exp $ */ +/* $XFree86: xc/lib/Xmu/DisplayQue.c,v 3.4 2001/07/25 15:04:50 dawes Exp $ */ /* * Author: Jim Fulton, MIT X Consortium diff --git a/src/Distinct.c b/src/Distinct.c index 1970a77..20aea9c 100644 --- a/src/Distinct.c +++ b/src/Distinct.c @@ -25,7 +25,7 @@ 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/Distinct.c,v 3.6 2001/12/14 19:55:41 dawes Exp $ */ +/* $XFree86: xc/lib/Xmu/Distinct.c,v 3.5 2001/07/25 15:04:50 dawes Exp $ */ /* * Author: Keith Packard, MIT X Consortium diff --git a/src/DrRndRect.c b/src/DrRndRect.c index 22b29e9..6e98be6 100644 --- a/src/DrRndRect.c +++ b/src/DrRndRect.c @@ -25,7 +25,7 @@ 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/DrRndRect.c,v 1.7 2001/12/14 19:55:41 dawes Exp $ */ +/* $XFree86: xc/lib/Xmu/DrRndRect.c,v 1.6 2001/01/17 19:42:54 dawes Exp $ */ /* * XmuDrawRoundedRectangle, XmuFillRoundedRectangle diff --git a/src/DrawLogo.c b/src/DrawLogo.c index 4cb4299..8488af9 100644 --- a/src/DrawLogo.c +++ b/src/DrawLogo.c @@ -25,7 +25,7 @@ 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/DrawLogo.c,v 1.8 2001/12/14 19:55:41 dawes Exp $ */ +/* $XFree86: xc/lib/Xmu/DrawLogo.c,v 1.7 2001/01/17 19:42:54 dawes Exp $ */ #include <X11/Xlib.h> #include <X11/Xmu/Drawing.h> diff --git a/src/EditresCom.c b/src/EditresCom.c index 4b6a5cc..d706112 100644 --- a/src/EditresCom.c +++ b/src/EditresCom.c @@ -753,6 +753,7 @@ FindChildren(Widget parent, Widget **children, Bool normal, Bool popup, for (i = 0; i < num_norm; i++) if (strcmp(norm_list[i].resource_type, XtRWidget) == 0) { + widget = NULL; XtSetArg(args[0], norm_list[i].resource_name, &widget); XtGetValues(parent, args, 1); if (widget && XtParent(widget) == parent) @@ -766,6 +767,7 @@ FindChildren(Widget parent, Widget **children, Bool normal, Bool popup, for (i = 0; i < num_cons; i++) if (strcmp(cons_list[i].resource_type, XtRWidget) == 0) { + widget = NULL; XtSetArg(args[0], cons_list[i].resource_name, &widget); XtGetValues(parent, args, 1); if (widget && XtParent(widget) == parent) @@ -816,8 +818,9 @@ FindChildren(Widget parent, Widget **children, Bool normal, Bool popup, for (j = 0; j < num_extra; j++) if ((*children)[i] == extra_widgets[j]) { - memmove(&extra_widgets[j], &extra_widgets[j + 1], - (num_extra - j) * sizeof(Widget)); + if ((j + 1) < num_extra) + memmove(&extra_widgets[j], &extra_widgets[j + 1], + (num_extra - j) * sizeof(Widget)); --num_extra; } @@ -999,7 +1002,8 @@ HandleToolkitErrors(String name, String type, String class, String msg, if (streq((String)info->event->value, XtRString)) XmuSnprintf(buf, sizeof(buf), "Could not convert the string '%s' for the `%s' " - "resource.", info->event->value, info->event->name); + "resource.", (String)info->event->value, + info->event->name); else XmuSnprintf(buf, sizeof(buf), "Could not convert the `%s' resource.", @@ -2189,11 +2193,11 @@ _XEditresGetStringValues(Widget w, Arg *warg, int numargs) XmuSnprintf(buffer, sizeof(buffer), "%d", (int)(value & 0xffff)); break; case sizeof(int): - XmuSnprintf(buffer, sizeof(buffer), "0x%08hx", (int)value); + XmuSnprintf(buffer, sizeof(buffer), "0x%08x", (int)value); break; #ifdef LONG_64 case sizeof(long): - XmuSnprintf(buffer, sizeof(buffer), "0x%016hx", value); + XmuSnprintf(buffer, sizeof(buffer), "0x%016lx", value); break; #endif } diff --git a/src/ExtAgent.c b/src/ExtAgent.c index 128d539..2be5cc4 100644 --- a/src/ExtAgent.c +++ b/src/ExtAgent.c @@ -25,7 +25,7 @@ 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.c,v 1.7 2001/12/14 19:55:45 dawes Exp $ */ +/* $XFree86: xc/lib/Xmu/ExtAgent.c,v 1.6 2001/01/17 19:42:55 dawes Exp $ */ #include <X11/Intrinsic.h> #include <X11/Xmu/ExtAgent.h> diff --git a/src/FToCback.c b/src/FToCback.c index ecafe41..4b4ffd2 100644 --- a/src/FToCback.c +++ b/src/FToCback.c @@ -25,7 +25,7 @@ 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/FToCback.c,v 1.7 2001/12/14 19:55:45 dawes Exp $ */ +/* $XFree86: xc/lib/Xmu/FToCback.c,v 1.6 2001/01/17 19:42:55 dawes Exp $ */ #include <X11/Intrinsic.h> #include <X11/Xmu/Converters.h> diff --git a/src/GetHost.c b/src/GetHost.c index 0fe71f2..2940c36 100644 --- a/src/GetHost.c +++ b/src/GetHost.c @@ -25,7 +25,7 @@ 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/GetHost.c,v 3.8 2001/12/14 19:55:46 dawes Exp $ */ +/* $XFree86: xc/lib/Xmu/GetHost.c,v 3.7 2001/07/25 15:04:50 dawes Exp $ */ /* * Author: Jim Fulton, MIT X Consortium diff --git a/src/GrayPixmap.c b/src/GrayPixmap.c index 4d8a51d..3c68749 100644 --- a/src/GrayPixmap.c +++ b/src/GrayPixmap.c @@ -49,7 +49,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xmu/GrayPixmap.c,v 1.6 2001/12/14 19:55:46 dawes Exp $ */ +/* $XFree86: xc/lib/Xmu/GrayPixmap.c,v 1.5 2001/01/17 19:42:55 dawes Exp $ */ #include <stdio.h> #include <X11/Intrinsic.h> diff --git a/src/Initer.c b/src/Initer.c index f80dfaf..da92688 100644 --- a/src/Initer.c +++ b/src/Initer.c @@ -25,7 +25,7 @@ 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.c,v 1.7 2001/12/14 19:55:46 dawes Exp $ */ +/* $XFree86: xc/lib/Xmu/Initer.c,v 1.6 2001/01/17 19:42:56 dawes Exp $ */ /* Created By: Chris D. Peterson * MIT X Consortium diff --git a/src/LocBitmap.c b/src/LocBitmap.c index b2af38d..f4cc091 100644 --- a/src/LocBitmap.c +++ b/src/LocBitmap.c @@ -25,7 +25,7 @@ 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/LocBitmap.c,v 3.10 2002/05/31 18:45:45 dawes Exp $ */ +/* $XFree86: xc/lib/Xmu/LocBitmap.c,v 3.9 2001/12/14 19:55:47 dawes Exp $ */ /* * Author: Jim Fulton, MIT X Consortium diff --git a/src/Lookup.c b/src/Lookup.c index a96109c..ff1177a 100644 --- a/src/Lookup.c +++ b/src/Lookup.c @@ -25,7 +25,7 @@ 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/Lookup.c,v 3.8 2001/12/14 19:55:47 dawes Exp $ */ +/* $XFree86: xc/lib/Xmu/Lookup.c,v 3.7 2001/01/17 19:42:56 dawes Exp $ */ #include <X11/Xmu/Lookup.h> diff --git a/src/LookupCmap.c b/src/LookupCmap.c index 47a2a2d..559831d 100644 --- a/src/LookupCmap.c +++ b/src/LookupCmap.c @@ -25,7 +25,7 @@ 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/LookupCmap.c,v 1.8 2001/12/14 19:55:47 dawes Exp $ */ +/* $XFree86: xc/lib/Xmu/LookupCmap.c,v 1.7 2001/07/25 15:04:50 dawes Exp $ */ /* * Author: Donna Converse, MIT X Consortium diff --git a/src/Lower.c b/src/Lower.c index 78f233c..315ee04 100644 --- a/src/Lower.c +++ b/src/Lower.c @@ -26,7 +26,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xmu/Lower.c,v 1.12 2001/12/14 19:55:47 dawes Exp $ */ +/* $XFree86: xc/lib/Xmu/Lower.c,v 1.11 2001/07/25 15:04:50 dawes Exp $ */ #define XK_LATIN1 #include <X11/keysymdef.h> diff --git a/src/RdBitF.c b/src/RdBitF.c index a6d83ee..46523f9 100644 --- a/src/RdBitF.c +++ b/src/RdBitF.c @@ -25,7 +25,7 @@ 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/RdBitF.c,v 3.13 2002/05/31 18:45:45 dawes Exp $ */ +/* $XFree86: xc/lib/Xmu/RdBitF.c,v 3.12 2001/12/14 19:55:48 dawes Exp $ */ /* * This file contains miscellaneous utility routines and is not part of the diff --git a/src/ScrOfWin.c b/src/ScrOfWin.c index d810e46..8a90caa 100644 --- a/src/ScrOfWin.c +++ b/src/ScrOfWin.c @@ -25,7 +25,7 @@ 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/ScrOfWin.c,v 1.7 2001/12/14 19:55:48 dawes Exp $ */ +/* $XFree86: xc/lib/Xmu/ScrOfWin.c,v 1.6 2001/01/17 19:42:56 dawes Exp $ */ /* * Author: Jim Fulton, MIT X Consortium diff --git a/src/ShapeWidg.c b/src/ShapeWidg.c index 2282d99..d011b59 100644 --- a/src/ShapeWidg.c +++ b/src/ShapeWidg.c @@ -25,7 +25,7 @@ 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/ShapeWidg.c,v 1.8 2001/12/14 19:55:48 dawes Exp $ */ +/* $XFree86: xc/lib/Xmu/ShapeWidg.c,v 1.7 2001/01/17 19:42:56 dawes Exp $ */ #include <X11/IntrinsicP.h> #include <X11/extensions/shape.h> diff --git a/src/StdCmap.c b/src/StdCmap.c index fec09ec..164f2f0 100644 --- a/src/StdCmap.c +++ b/src/StdCmap.c @@ -25,7 +25,7 @@ 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.c,v 1.6 2001/12/14 19:55:48 dawes Exp $ */ +/* $XFree86: xc/lib/Xmu/StdCmap.c,v 1.5 2001/01/17 19:42:56 dawes Exp $ */ /* * Author: Donna Converse, MIT X Consortium diff --git a/src/StrToBS.c b/src/StrToBS.c index a459011..899421e 100644 --- a/src/StrToBS.c +++ b/src/StrToBS.c @@ -26,7 +26,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xmu/StrToBS.c,v 1.7 2001/12/14 19:55:50 dawes Exp $ */ +/* $XFree86: xc/lib/Xmu/StrToBS.c,v 1.6 2001/01/17 19:42:56 dawes Exp $ */ #include <X11/Intrinsic.h> #include "Converters.h" diff --git a/src/StrToBmap.c b/src/StrToBmap.c index db448c4..1691fb4 100644 --- a/src/StrToBmap.c +++ b/src/StrToBmap.c @@ -49,7 +49,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xmu/StrToBmap.c,v 1.6 2001/12/14 19:55:50 dawes Exp $ */ +/* $XFree86: xc/lib/Xmu/StrToBmap.c,v 1.5 2001/01/17 19:42:57 dawes Exp $ */ #include <X11/Intrinsic.h> #include <X11/StringDefs.h> diff --git a/src/StrToCurs.c b/src/StrToCurs.c index 40a9bf6..2cd1630 100644 --- a/src/StrToCurs.c +++ b/src/StrToCurs.c @@ -50,7 +50,7 @@ SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xmu/StrToCurs.c,v 1.12 2002/09/24 18:55:21 alanh Exp $ */ +/* $XFree86: xc/lib/Xmu/StrToCurs.c,v 1.11 2002/09/19 13:21:58 tsi Exp $ */ #include <X11/Intrinsic.h> #include <X11/StringDefs.h> diff --git a/src/StrToGrav.c b/src/StrToGrav.c index 7ccb04a..31e4630 100644 --- a/src/StrToGrav.c +++ b/src/StrToGrav.c @@ -25,7 +25,7 @@ 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/StrToGrav.c,v 1.7 2001/12/14 19:55:52 dawes Exp $ */ +/* $XFree86: xc/lib/Xmu/StrToGrav.c,v 1.6 2001/01/17 19:42:57 dawes Exp $ */ #include <X11/Intrinsic.h> #include <X11/Xmu/Converters.h> diff --git a/src/StrToJust.c b/src/StrToJust.c index 205569c..ba58937 100644 --- a/src/StrToJust.c +++ b/src/StrToJust.c @@ -26,7 +26,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xmu/StrToJust.c,v 1.7 2001/12/14 19:55:52 dawes Exp $ */ +/* $XFree86: xc/lib/Xmu/StrToJust.c,v 1.6 2001/01/17 19:42:57 dawes Exp $ */ #include <string.h> #include <X11/Intrinsic.h> diff --git a/src/StrToLong.c b/src/StrToLong.c index 0eaf793..361dba1 100644 --- a/src/StrToLong.c +++ b/src/StrToLong.c @@ -25,7 +25,7 @@ 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/StrToLong.c,v 1.9 2001/12/14 19:55:52 dawes Exp $ */ +/* $XFree86: xc/lib/Xmu/StrToLong.c,v 1.8 2001/08/23 00:03:21 dawes Exp $ */ #include <stdio.h> #include <X11/Intrinsic.h> diff --git a/src/StrToOrnt.c b/src/StrToOrnt.c index dec879d..70593b4 100644 --- a/src/StrToOrnt.c +++ b/src/StrToOrnt.c @@ -26,7 +26,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xmu/StrToOrnt.c,v 1.7 2001/12/14 19:55:52 dawes Exp $ */ +/* $XFree86: xc/lib/Xmu/StrToOrnt.c,v 1.6 2001/01/17 19:42:57 dawes Exp $ */ #include <X11/Intrinsic.h> #include <X11/StringDefs.h> diff --git a/src/StrToShap.c b/src/StrToShap.c index 6c9092b..963d162 100644 --- a/src/StrToShap.c +++ b/src/StrToShap.c @@ -25,7 +25,7 @@ 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/StrToShap.c,v 1.7 2001/12/14 19:55:53 dawes Exp $ */ +/* $XFree86: xc/lib/Xmu/StrToShap.c,v 1.6 2001/01/17 19:42:57 dawes Exp $ */ #include <string.h> #include <X11/Intrinsic.h> diff --git a/src/StrToWidg.c b/src/StrToWidg.c index cf12380..dc368b7 100644 --- a/src/StrToWidg.c +++ b/src/StrToWidg.c @@ -25,7 +25,7 @@ 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/StrToWidg.c,v 1.7 2001/12/14 19:55:53 dawes Exp $ */ +/* $XFree86: xc/lib/Xmu/StrToWidg.c,v 1.6 2001/01/17 19:42:57 dawes Exp $ */ /* * XmuCvtStringToWidget diff --git a/src/UpdMapHint.c b/src/UpdMapHint.c index cd7ee92..bd111aa 100644 --- a/src/UpdMapHint.c +++ b/src/UpdMapHint.c @@ -25,7 +25,7 @@ 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/UpdMapHint.c,v 1.7 2001/12/14 19:55:55 dawes Exp $ */ +/* $XFree86: xc/lib/Xmu/UpdMapHint.c,v 1.6 2001/01/17 19:42:57 dawes Exp $ */ /* * Author: Jim Fulton, MIT X Consortium diff --git a/src/VisCmap.c b/src/VisCmap.c index c551f29..9de4b85 100644 --- a/src/VisCmap.c +++ b/src/VisCmap.c @@ -25,7 +25,7 @@ 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/VisCmap.c,v 1.7 2001/12/14 19:55:56 dawes Exp $ */ +/* $XFree86: xc/lib/Xmu/VisCmap.c,v 1.6 2001/01/17 19:42:57 dawes Exp $ */ /* * Author: Donna Converse, MIT X Consortium diff --git a/src/WidgetNode.c b/src/WidgetNode.c index 5a34156..f8200b1 100644 --- a/src/WidgetNode.c +++ b/src/WidgetNode.c @@ -26,7 +26,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xmu/WidgetNode.c,v 1.13 2002/09/24 18:55:21 alanh Exp $ */ +/* $XFree86: xc/lib/Xmu/WidgetNode.c,v 1.12 2002/09/19 13:21:58 tsi Exp $ */ /* * Author: Jim Fulton, MIT X Consortium @@ -25,7 +25,7 @@ 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.c,v 1.9 2001/12/14 19:55:58 dawes Exp $ */ +/* $XFree86: xc/lib/Xmu/Xct.c,v 1.8 2001/07/25 15:04:50 dawes Exp $ */ #include <X11/Xfuncs.h> #include "Xct.h" diff --git a/src/sharedlib.c b/src/sharedlib.c index 599de7d..05e891e 100644 --- a/src/sharedlib.c +++ b/src/sharedlib.c @@ -25,7 +25,7 @@ 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/sharedlib.c,v 3.5 2001/12/14 19:56:00 dawes Exp $ */ +/* $XFree86: xc/lib/Xmu/sharedlib.c,v 3.4 2001/07/25 15:04:51 dawes Exp $ */ #if defined(SUNSHLIB) && !defined(SHAREDCODE) |