summaryrefslogtreecommitdiff
path: root/include/pixmap.h
diff options
context:
space:
mode:
authorKaleb Keithley <kaleb@freedesktop.org>2003-11-25 19:29:01 +0000
committerKaleb Keithley <kaleb@freedesktop.org>2003-11-25 19:29:01 +0000
commitadc7f9a4ebdfe11d4cd6de9388b63dfe36450b39 (patch)
tree23eb7becc5360b2cbe16aa8d45529880067f3989 /include/pixmap.h
parent90f1536dd315cd265bfc7ef35058761a65a01734 (diff)
XFree86 4.3.99.16 Bring the tree up to date for the Cygwin folksxf86-4_3_99_16
Diffstat (limited to 'include/pixmap.h')
-rw-r--r--include/pixmap.h27
1 files changed, 7 insertions, 20 deletions
diff --git a/include/pixmap.h b/include/pixmap.h
index 766091046..56bb675ae 100644
--- a/include/pixmap.h
+++ b/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 */