Attachment 73 Details for Bug 148 – Put calls to Xcms within #ifndef DISABLE_XCMS / #endif

[patch] Put calls to Xcms within #ifndef DISABLE_XCMS / #endif

really-disable-xcms.patch (text/plain), 2.91 KB, created by Luciano Montanaro on 2003-11-17 09:02:46 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Luciano Montanaro

Created: 2003-11-17 09:02:46 UTC

Size: 2.91 KB

patch

obsolete

>? really-disable-xcms.patch
>Index: CrCmap.c
>===================================================================
>RCS file: /cvs/xlibs/X11/src/CrCmap.c,v
>retrieving revision 1.5
>diff -p -u -r1.5 CrCmap.c
>--- CrCmap.c	13 Apr 2003 19:22:14 -0000	1.5
>+++ CrCmap.c	17 Nov 2003 16:57:24 -0000
>@@ -50,7 +50,9 @@ int alloc;
>     UnlockDisplay(dpy);
>     SyncHandle();
> 
>+#ifndef DISABLE_XCMS
>     _XcmsAddCmapRec(dpy, mid, w, visual);
>+#endif
> 
>     return(mid);
> }
>Index: GetColor.c
>===================================================================
>RCS file: /cvs/xlibs/X11/src/GetColor.c,v
>retrieving revision 1.6
>diff -p -u -r1.6 GetColor.c
>--- GetColor.c	13 Apr 2003 19:22:16 -0000	1.6
>+++ GetColor.c	17 Nov 2003 16:57:25 -0000
>@@ -56,6 +56,7 @@ XColor *exact_def; /* RETURN */
>     XcmsColor cmsColor_exact;
>     Status ret;
> 
>+#ifndef DISABLE_XCMS
>     /*
>      * Let's Attempt to use Xcms and i18n approach to Parse Color
>      */
>@@ -81,6 +82,7 @@ XColor *exact_def; /* RETURN */
> 	    break;
> 	}
>     }
>+#endif
> 
>     /*
>      * Xcms and i18n approach failed.
>Index: LookupCol.c
>===================================================================
>RCS file: /cvs/xlibs/X11/src/LookupCol.c,v
>retrieving revision 1.6
>diff -p -u -r1.6 LookupCol.c
>--- LookupCol.c	13 Apr 2003 19:22:16 -0000	1.6
>+++ LookupCol.c	17 Nov 2003 16:57:25 -0000
>@@ -53,6 +53,7 @@ Status XLookupColor (dpy, cmap, spec, de
> 	XcmsCCC ccc;
> 	XcmsColor cmsColor_exact;
> 
>+#ifndef DISABLE_XCMS
> 	/*
> 	 * Let's Attempt to use Xcms and i18n approach to Parse Color
> 	 */
>@@ -77,6 +78,7 @@ Status XLookupColor (dpy, cmap, spec, de
> 		break;
> 	    }
> 	}
>+#endif
> 
> 	/*
> 	 * Xcms and i18n methods failed, so lets pass it to the server
>Index: ParseCol.c
>===================================================================
>RCS file: /cvs/xlibs/X11/src/ParseCol.c,v
>retrieving revision 1.6
>diff -p -u -r1.6 ParseCol.c
>--- ParseCol.c	13 Apr 2003 19:22:17 -0000	1.6
>+++ ParseCol.c	17 Nov 2003 16:57:26 -0000
>@@ -90,6 +90,7 @@ Status XParseColor (dpy, cmap, spec, def
> 	}
> 
> 
>+#ifndef DISABLE_XCMS
> 	/*
> 	 * Let's Attempt to use Xcms and i18n approach to Parse Color
> 	 */
>@@ -113,6 +114,7 @@ Status XParseColor (dpy, cmap, spec, def
> 		break;
> 	    }
> 	}
>+#endif
> 
> 	/*
> 	 * Xcms and i18n methods failed, so lets pass it to the server
>Index: StNColor.c
>===================================================================
>RCS file: /cvs/xlibs/X11/src/StNColor.c,v
>retrieving revision 1.5
>diff -p -u -r1.5 StNColor.c
>--- StNColor.c	13 Apr 2003 19:22:18 -0000	1.5
>+++ StNColor.c	17 Nov 2003 16:57:26 -0000
>@@ -54,6 +54,7 @@ int flags;  /* DoRed, DoGreen, DoBlue */
>     XcmsColor cmsColor_exact;
>     XColor scr_def;
> 
>+#ifndef DISABLE_XCMS
>     /*
>      * Let's Attempt to use Xcms approach to Parse Color
>      */
>@@ -70,6 +71,7 @@ int flags;  /* DoRed, DoGreen, DoBlue */
> 	 * name.  Thus pass name to the X Server.
> 	 */
>     }
>+#endif
> 
>     /*
>      * The Xcms and i18n methods failed, so lets pass it to the server

Actions: View | Splinter Review

Attachments on bug 148: 73

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.