summaryrefslogtreecommitdiff
path: root/dsimple.h
diff options
context:
space:
mode:
authorKaleb Keithley <kaleb@freedesktop.org>2003-11-25 19:29:15 +0000
committerKaleb Keithley <kaleb@freedesktop.org>2003-11-25 19:29:15 +0000
commitef18ebade29f85a228da73a3ad13fe800cb7b62b (patch)
tree41123e3c0eefe5958e873eb5d11314dea956cc5e /dsimple.h
parent491b5e903ad3091687ae39159aba3e434476f8d4 (diff)
XFree86 4.3.99.16 Bring the tree up to date for the Cygwin folksxf86-4_3_99_903_specialxf86-4_3_99_902xf86-4_3_99_901xf86-4_3_99_16xf86-012804-2330
Diffstat (limited to 'dsimple.h')
-rw-r--r--dsimple.h24
1 files changed, 1 insertions, 23 deletions
diff --git a/dsimple.h b/dsimple.h
index a11cae7..7efd5c0 100644
--- a/dsimple.h
+++ b/dsimple.h
@@ -26,7 +26,7 @@ other dealings in this Software without prior written authorization
from The Open Group.
*/
-/* $XFree86: xc/programs/xlsfonts/dsimple.h,v 1.8 2002/12/24 17:43:01 tsi Exp $ */
+/* $XFree86: xc/programs/xlsfonts/dsimple.h,v 1.9 2003/11/17 22:20:54 dawes Exp $ */
/*
* Just_display.h: This file contains the definitions needed to use the
@@ -50,7 +50,6 @@ extern int screen; /* The current screen */
/* Declaritions for functions in just_display.c */
-#if NeedFunctionPrototypes
char *Malloc(unsigned);
char *Realloc(char *, int);
char *Get_Display_Name(int *, char **);
@@ -62,19 +61,6 @@ Pixmap ReadBitmapFile(Drawable, char *, int *, int *, int *, int *);
void WriteBitmapFile(char *, Pixmap, int, int, int, int);
Window Select_Window_Args(int *, char **);
void usage(void);
-#else
-char *Malloc();
-char *Realloc();
-char *Get_Display_Name();
-Display *Open_Display();
-void Setup_Display_And_Screen();
-XFontStruct *Open_Font();
-void Beep();
-Pixmap ReadBitmapFile();
-void WriteBitmapFile();
-Window Select_Window_Args();
-void usage();
-#endif
#define X_USAGE "[host:display]" /* X arguments handled by
Get_Display_Name */
@@ -87,19 +73,11 @@ void usage();
* Send bugs, etc. to chariot@athena.mit.edu.
*/
-#if NeedFunctionPrototypes
unsigned long Resolve_Color(Window, char *);
Pixmap Bitmap_To_Pixmap(Display *, Drawable, GC, Pixmap, int, int);
Window Select_Window(Display *);
void blip(void);
Window Window_With_Name(Display *, Window, char *);
-#else
-unsigned long Resolve_Color();
-Pixmap Bitmap_To_Pixmap();
-Window Select_Window();
-void blip();
-Window Window_With_Name();
-#endif
#ifdef __GNUC__
void Fatal_Error(char *, ...) __attribute__((__noreturn__));
#else