merge latest (4.3.99.16) from XFree86 (vendor) branch

include/pixmap.h

@@ -45,6 +45,8 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ******************************************************************/
+/* $XFree86: xc/programs/Xserver/include/pixmap.h,v 1.4 2003/11/03 05:36:35 tsi Exp $ */
+
 #ifndef PIXMAP_H
 #define PIXMAP_H
 
@@ -84,40 +86,25 @@ typedef union _PixUnion {
 	((type == DRAWABLE_WINDOW) || (type == UNDRAWABLE_WINDOW))
 
 extern PixmapPtr GetScratchPixmapHeader(
-#if NeedFunctionPrototypes
     ScreenPtr /*pScreen*/,
     int /*width*/,
     int /*height*/,
     int /*depth*/,
     int /*bitsPerPixel*/,
     int /*devKind*/,
-    pointer /*pPixData*/
-#endif
-);
+    pointer /*pPixData*/);
 
 extern void FreeScratchPixmapHeader(
-#if NeedFunctionPrototypes
-    PixmapPtr /*pPixmap*/
-#endif
-);
+    PixmapPtr /*pPixmap*/);
 
 extern Bool CreateScratchPixmapsForScreen(
-#if NeedFunctionPrototypes
-    int /*scrnum*/
-#endif
-);
+    int /*scrnum*/);
 
 extern void FreeScratchPixmapsForScreen(
-#if NeedFunctionPrototypes
-    int /*scrnum*/
-#endif
-);
+    int /*scrnum*/);
 
 extern PixmapPtr AllocatePixmap(
-#if NeedFunctionPrototypes
     ScreenPtr /*pScreen*/,
-    int /*pixDataSize*/
-#endif
-);
+    int /*pixDataSize*/);
 
 #endif /* PIXMAP_H */