merge XFree86 4.3.0.1 to -CURRENT

include/screenint.h

@@ -45,6 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ******************************************************************/
+/* $XFree86: xc/programs/Xserver/include/screenint.h,v 1.5 2001/12/14 19:59:56 dawes Exp $ */
 #ifndef SCREENINT_H
 #define SCREENINT_H
 
@@ -153,7 +154,12 @@ extern void ResetColormapPrivates(
 );
 
 
-typedef int (*InitCmapPrivFunc)(/* ColormapPtr */);
+typedef struct _ColormapRec *ColormapPtr;
+typedef int (*InitCmapPrivFunc)(
+#if NeedNestedPrototypes
+	ColormapPtr
+#endif
+);
 
 extern int AllocateColormapPrivateIndex(
 #if NeedFunctionPrototypes