summaryrefslogtreecommitdiff
path: root/include/colormap.h
diff options
context:
space:
mode:
authorKaleb Keithley <kaleb@freedesktop.org>2003-11-14 16:49:22 +0000
committerKaleb Keithley <kaleb@freedesktop.org>2003-11-14 16:49:22 +0000
commitd568221710959cf7d783e6ff0fb80fb43a231124 (patch)
tree8d6f039393294c6ffac8533639afdebe5d68bfc1 /include/colormap.h
parent9508a382f8a9f241dab097d921b6d290c1c3a776 (diff)
XFree86 4.3.0.1
Diffstat (limited to 'include/colormap.h')
-rw-r--r--include/colormap.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/include/colormap.h b/include/colormap.h
index e2515a8ed..2a8f87f23 100644
--- a/include/colormap.h
+++ b/include/colormap.h
@@ -1,3 +1,4 @@
+/* $XFree86: xc/programs/Xserver/include/colormap.h,v 1.5 2001/12/14 19:59:53 dawes Exp $ */
/*
Copyright 1987, 1998 The Open Group
@@ -45,6 +46,7 @@ SOFTWARE.
*/
/* $Xorg: colormap.h,v 1.4 2001/02/09 02:05:14 xorgcvs Exp $ */
+
#ifndef CMAP_H
#define CMAP_H 1
@@ -73,7 +75,7 @@ SOFTWARE.
typedef CARD32 Pixel;
typedef struct _CMEntry *EntryPtr;
-typedef struct _ColormapRec *ColormapPtr;
+/* moved to screenint.h: typedef struct _ColormapRec *ColormapPtr */
typedef struct _colorResource *colorResourcePtr;
extern int CreateColormap(