diff options
Diffstat (limited to 'hw/xnest/Color.c')
| -rw-r--r-- | hw/xnest/Color.c | 27 |
1 files changed, 13 insertions, 14 deletions
diff --git a/hw/xnest/Color.c b/hw/xnest/Color.c index bb829847e..b8460b974 100644 --- a/hw/xnest/Color.c +++ b/hw/xnest/Color.c @@ -11,15 +11,14 @@ the suitability of this software for any purpose. It is provided "as is" without express or implied warranty. */ - -#ifdef HAVE_XNEST_CONFIG_H -#include <xnest-config.h> -#endif +#include <dix-config.h> #include <X11/X.h> #include <X11/Xdefs.h> #include <X11/Xproto.h> +#include "dix/colormap_priv.h" + #include "scrnintstr.h" #include "window.h" #include "windowstr.h" @@ -126,7 +125,7 @@ xnestCreateColormap(ColormapPtr pCmap) break; } - return True; + return TRUE; } void @@ -175,19 +174,19 @@ static Bool xnestSameInstalledColormapWindows(Window *windows, int numWindows) { if (xnestNumOldInstalledColormapWindows != numWindows) - return False; + return FALSE; if (xnestOldInstalledColormapWindows == windows) - return True; + return TRUE; if (xnestOldInstalledColormapWindows == NULL || windows == NULL) - return False; + return FALSE; if (memcmp(xnestOldInstalledColormapWindows, windows, numWindows * sizeof(Window))) - return False; + return FALSE; - return True; + return TRUE; } void @@ -372,7 +371,7 @@ xnestUninstallColormap(ColormapPtr pCmap) } } -static Bool xnestInstalledDefaultColormap = False; +static Bool xnestInstalledDefaultColormap = FALSE; int xnestListInstalledColormaps(ScreenPtr pScreen, Colormap * pCmapIDs) @@ -474,7 +473,7 @@ xnestCreateDefaultColormap(ScreenPtr pScreen) (pVisual->class & DynamicClass) ? AllocNone : AllocAll, 0) != Success) - return False; + return FALSE; wp = pScreen->whitePixel; bp = pScreen->blackPixel; @@ -486,7 +485,7 @@ xnestCreateDefaultColormap(ScreenPtr pScreen) pScreen->blackPixel = bp; (*pScreen->InstallColormap) (pCmap); - xnestInstalledDefaultColormap = True; + xnestInstalledDefaultColormap = TRUE; - return True; + return TRUE; } |