Xt ChangeLog, 3.15, 3.16 Composite.c, 1.6, 1.7 Converters.c, 3.16, 3.17 Xtos.h, 3.14, 3.15

[Daniel Stone]

Committed by: daniels

Update of /cvs/xlibs/Xt
In directory gabe:/tmp/cvs-serv6805

Modified Files:
	ChangeLog Composite.c Converters.c Xtos.h 
Log Message:
Resync with X.Org HEAD (minor tweaks).

Index: ChangeLog
===================================================================
RCS file: /cvs/xlibs/Xt/ChangeLog,v
retrieving revision 3.15
retrieving revision 3.16
diff -u -d -r3.15 -r3.16
--- ChangeLog	19 Jan 2005 06:40:44 -0000	3.15
+++ ChangeLog	28 Jan 2005 19:46:43 -0000	3.16
@@ -1,3 +1,11 @@
+2005-01-29  Daniel Stone  <daniel@freedesktop.org>
+
+	* Composite.c:
+	* Converters.c:
+	* Xtos.h:
+	* include/X11/Composite.h:
+	Resync with X.Org HEAD (all minor fixes).
+
 2005-01-19  Daniel Stone  <daniel@freedesktop.org>
 
 	* configure.ac:

Index: Composite.c
===================================================================
RCS file: /cvs/xlibs/Xt/Composite.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- Composite.c	14 Dec 2001 19:56:08 -0000	1.6
+++ Composite.c	28 Jan 2005 19:46:43 -0000	1.7
@@ -60,7 +60,7 @@
 */
 /* $XFree86: xc/lib/Xt/Composite.c,v 1.5 2001/08/22 22:52:17 dawes Exp $ */
 
-#define COMPOSITE
+#define XT_COMPOSITE
 #include "IntrinsicI.h"
 #include "StringDefs.h"
 

Index: Converters.c
===================================================================
RCS file: /cvs/xlibs/Xt/Converters.c,v
retrieving revision 3.16
retrieving revision 3.17
diff -u -d -r3.16 -r3.17
--- Converters.c	2 Dec 2003 22:38:25 -0000	3.16
+++ Converters.c	28 Jan 2005 19:46:43 -0000	3.17
@@ -485,29 +485,13 @@
 
     if (CompareISOLatin1(str, XtDefaultBackground) == 0) {
 	*closure_ret = False;
-	if (colormap == DefaultColormapOfScreen (screen))
-	{
-	    if (pd->rv) donestr(Pixel, BlackPixelOfScreen(screen), XtRPixel)
-	    else	donestr(Pixel, WhitePixelOfScreen(screen), XtRPixel);
-	}
-	else
-	{
-	    if (pd->rv) str = "black";
-	    else	str = "white";
-	}
+        if (pd->rv) donestr(Pixel, BlackPixelOfScreen(screen), XtRPixel)
+        else	donestr(Pixel, WhitePixelOfScreen(screen), XtRPixel);
     }
     if (CompareISOLatin1(str, XtDefaultForeground) == 0) {
 	*closure_ret = False;
-	if (colormap == DefaultColormapOfScreen (screen))
-	{
-	    if (pd->rv) donestr(Pixel, WhitePixelOfScreen(screen), XtRPixel)
-	    else	donestr(Pixel, BlackPixelOfScreen(screen), XtRPixel);
-	}
-	else
-	{
-	    if (pd->rv) str = "white";
-	    else	str = "black";
-	}
+        if (pd->rv) donestr(Pixel, WhitePixelOfScreen(screen), XtRPixel)
+        else	donestr(Pixel, BlackPixelOfScreen(screen), XtRPixel);
     }
 
     status = XAllocNamedColor(DisplayOfScreen(screen), colormap,

Index: Xtos.h
===================================================================
RCS file: /cvs/xlibs/Xt/Xtos.h,v
retrieving revision 3.14
retrieving revision 3.15
diff -u -d -r3.14 -r3.15
--- Xtos.h	18 Apr 2004 11:14:19 -0000	3.14
+++ Xtos.h	28 Jan 2005 19:46:43 -0000	3.15
@@ -68,6 +68,7 @@
     defined(__s390x__) || \
     (defined(__hppa__) && defined(__LP64__)) || \
     defined(__amd64__) || defined(amd64) || \
+    defined(__powerpc64__) || \
     (defined(sgi) && (_MIPS_SZLONG == 64))
 #define LONG64
 #endif