--- xc/lib/Xau/AuFileName.c-orig 2003-07-23 17:17:57.000000000 +0900 +++ xc/lib/Xau/AuFileName.c 2006-07-21 09:00:39.000000000 +0900 @@ -33,7 +33,9 @@ XauFileName () { char *slashDotXauthority = "/.Xauthority"; - char *name, *malloc (), *getenv (); + char *name; + void *malloc (); + char *getenv (); static char *buf; static int bsize; #ifdef WIN32 --- xc/lib/Xmu/CloseHook.c-orig 2003-07-23 17:17:57.000000000 +0900 +++ xc/lib/Xmu/CloseHook.c 2006-07-21 09:16:19.000000000 +0900 @@ -58,7 +58,7 @@ #include #include -extern char *malloc(); /* should be void * */ +extern void *malloc(); /* should be void * */ /* * Private data --- xc/lib/Xmu/CvtCache.c-orig 2003-07-23 17:17:57.000000000 +0900 +++ xc/lib/Xmu/CvtCache.c 2006-07-21 09:16:49.000000000 +0900 @@ -35,7 +35,7 @@ #include #include -extern char *malloc(); +extern void *malloc(); static XmuDisplayQueue *dq = NULL; static int _CloseDisplay(), _FreeCCDQ(); --- xc/programs/Xserver/Xext/shm.c-orig 2003-08-28 20:43:35.000000000 +0900 +++ xc/programs/Xserver/Xext/shm.c 2006-07-21 10:59:31.000000000 +0900 @@ -73,6 +73,8 @@ static void ShmResetProc(), SShmCompletionEvent(); static Bool ShmDestroyPixmap (PixmapPtr pPixmap); +static int ProcShmPutImage(client); +static int ProcShmGetImage(client); static unsigned char ShmReqCode; int ShmCompletionCode; @@ -533,7 +535,7 @@ if (draw->type == XRT_PIXMAP) return ProcShmGetImage(client); - + VERIFY_DRAWABLE(pDraw, stuff->drawable, client); VERIFY_SHMPTR(stuff->shmseg, stuff->offset, TRUE, shmdesc, client); --- xc/programs/Xserver/os/utils.c-orig 2003-09-29 02:12:53.000000000 +0900 +++ xc/programs/Xserver/os/utils.c 2006-07-21 10:49:10.000000000 +0900 @@ -856,7 +856,7 @@ Xalloc (amount) unsigned long amount; { - char *malloc(); + void *malloc(); register pointer ptr; if ((long)amount <= 0) @@ -884,7 +884,7 @@ XNFalloc (amount) unsigned long amount; { - char *malloc(); + void *malloc(); register pointer ptr; if ((long)amount <= 0) @@ -944,8 +944,8 @@ register pointer ptr; unsigned long amount; { - char *malloc(); - char *realloc(); + void *malloc(); + void *realloc(); #ifdef MEMBUG if (!Must_have_memory && Memory_fail && --- xc/programs/bitmap/atobm.c-orig 2003-07-23 17:18:08.000000000 +0900 +++ xc/programs/bitmap/atobm.c 2006-07-21 09:17:57.000000000 +0900 @@ -36,7 +36,7 @@ #include #include -extern char *malloc(), *calloc(); +extern void *malloc(), *calloc(); char *ProgramName; --- xc/programs/bitmap/bmtoa.c-orig 2003-07-23 17:18:08.000000000 +0900 +++ xc/programs/bitmap/bmtoa.c 2006-07-21 09:17:40.000000000 +0900 @@ -39,7 +39,7 @@ #include -extern char *malloc(); +extern void *malloc(); extern char *mktemp(); char *ProgramName; --- xc/programs/iceauth/iceauth.h-orig 2003-07-23 17:18:08.000000000 +0900 +++ xc/programs/iceauth/iceauth.h 2006-07-21 09:18:43.000000000 +0900 @@ -41,7 +41,7 @@ extern char *ProgramName; -extern char *malloc(), *realloc(); +extern void *malloc(), *realloc(); int process_command(), auth_initialize(), auth_finalize(); extern int print_help(); extern int verbose; --- xc/programs/xauth/parsedpy.c-orig 2003-07-23 17:18:08.000000000 +0900 +++ xc/programs/xauth/parsedpy.c 2006-07-21 09:19:25.000000000 +0900 @@ -44,7 +44,7 @@ #define UNIX_CONNECTION_LENGTH 4 #endif -extern char *malloc(); +extern void *malloc(); /* --- xc/programs/xconsole/xconsole.c-orig 2003-07-23 17:18:08.000000000 +0900 +++ xc/programs/xconsole/xconsole.c 2006-07-21 09:19:53.000000000 +0900 @@ -274,7 +274,7 @@ } #endif -extern char *malloc (); +extern void *malloc (); static void Notify () --- xc/programs/xfs/os/utils.c-orig 2003-07-26 02:41:15.000000000 +0900 +++ xc/programs/xfs/os/utils.c 2006-07-21 09:24:54.000000000 +0900 @@ -393,7 +393,7 @@ register pointer ptr; unsigned long amount; { - char *realloc(); + void *realloc(); #ifdef MEMBUG if (!Must_have_memory && MemoryFail && --- xc/programs/xlsfonts/dsimple.c-orig 2003-07-23 17:18:10.000000000 +0900 +++ xc/programs/xlsfonts/dsimple.c 2006-07-21 10:46:19.000000000 +0900 @@ -69,9 +69,10 @@ char *Malloc(size) unsigned size; { - char *data, *malloc(); + char *data; + void *malloc(); - if (!(data = malloc(size))) + if (!(data = (char *) malloc(size))) Fatal_Error("Out of memory!"); return(data); @@ -85,12 +86,13 @@ char *ptr; int size; { - char *new_ptr, *realloc(); + char *new_ptr; + void *realloc(); if (!ptr) return(Malloc(size)); - if (!(new_ptr = realloc(ptr, size))) + if (!(new_ptr = (char *) realloc(ptr, size))) Fatal_Error("Out of memory!"); return(new_ptr); --- xc/programs/xprop/dsimple.c-orig 2003-07-23 17:18:10.000000000 +0900 +++ xc/programs/xprop/dsimple.c 2006-07-21 10:25:16.000000000 +0900 @@ -69,9 +69,10 @@ char *Malloc(size) unsigned size; { - char *data, *malloc(); + char *data; + void *malloc(); - if (!(data = malloc(size))) + if (!(data = (char *) malloc(size))) Fatal_Error("Out of memory!"); return(data); @@ -85,12 +86,13 @@ char *ptr; int size; { - char *new_ptr, *realloc(); + char *new_ptr; + void *realloc(); if (!ptr) return(Malloc(size)); - if (!(new_ptr = realloc(ptr, size))) + if (!(new_ptr = (char *) realloc(ptr, size))) Fatal_Error("Out of memory!"); return(new_ptr); --- xc/programs/xrefresh/xrefresh.c-orig 2003-07-23 17:18:10.000000000 +0900 +++ xc/programs/xrefresh/xrefresh.c 2006-07-21 10:45:40.000000000 +0900 @@ -59,7 +59,7 @@ #include #include -char *malloc(); +extern void *malloc(); Window win; @@ -85,10 +85,10 @@ register char *s; { int len = (s ? strlen (s) : 0) + 1; - char *malloc(); + void *malloc(); char *retval; - retval = malloc (len); + retval = (char *) malloc (len); if (!retval) { fprintf (stderr, "%s: unable to allocate %d bytes for string.\n", ProgramName, len); --- xc/programs/xwd/dsimple.c-orig 2003-07-23 17:18:10.000000000 +0900 +++ xc/programs/xwd/dsimple.c 2006-07-21 10:26:10.000000000 +0900 @@ -70,9 +70,10 @@ char *Malloc(size) unsigned size; { - char *data, *malloc(); + char *data; + void *malloc(); - if (!(data = malloc(size))) + if (!(data = (char *) malloc(size))) Fatal_Error("Out of memory!"); return(data); @@ -86,12 +87,13 @@ char *ptr; int size; { - char *new_ptr, *realloc(); + char *new_ptr; + void *realloc(); if (!ptr) return(Malloc(size)); - if (!(new_ptr = realloc(ptr, size))) + if (!(new_ptr = (char *) realloc(ptr, size))) Fatal_Error("Out of memory!"); return(new_ptr); --- xc/programs/xwd/xwd.c-orig 2003-07-23 17:18:10.000000000 +0900 +++ xc/programs/xwd/xwd.c 2006-07-21 10:47:57.000000000 +0900 @@ -243,7 +243,7 @@ * writting. */ -char *calloc(); +// extern void *calloc(); Window_Dump(window, out) Window window; --- xc/programs/xwininfo/dsimple.c-orig 2003-07-23 17:18:10.000000000 +0900 +++ xc/programs/xwininfo/dsimple.c 2006-07-21 10:27:09.000000000 +0900 @@ -70,9 +70,10 @@ char *Malloc(size) unsigned size; { - char *data, *malloc(); + char *data; + void *malloc(); - if (!(data = malloc(size))) + if (!(data = (char *) malloc(size))) Fatal_Error("Out of memory!"); return(data); @@ -86,12 +87,13 @@ char *ptr; int size; { - char *new_ptr, *realloc(); + char *new_ptr; + void *realloc(); if (!ptr) return(Malloc(size)); - if (!(new_ptr = realloc(ptr, size))) + if (!(new_ptr = (char *) realloc(ptr, size))) Fatal_Error("Out of memory!"); return(new_ptr); --- xc/programs/xwud/xwud.c-orig 2003-07-23 17:18:10.000000000 +0900 +++ xc/programs/xwud/xwud.c 2006-07-21 10:27:56.000000000 +0900 @@ -44,7 +44,7 @@ extern int errno; #endif -extern char *malloc(); +extern void *malloc(); unsigned Image_Size(); Atom wm_protocols; Atom wm_delete_window; --- xc/programs/xterm/charproc.c-orig 2003-07-23 17:18:10.000000000 +0900 +++ xc/programs/xterm/charproc.c 2006-07-21 11:31:22.000000000 +0900 @@ -96,8 +96,8 @@ extern XtAppContext app_con; extern Widget toplevel; extern void exit(); -extern char *malloc(); -extern char *realloc(); +extern void *malloc(); +extern void *realloc(); extern fd_set Select_mask; extern fd_set X_mask; extern fd_set pty_mask; @@ -111,7 +111,9 @@ static void update_font_info(); static void bitset(), bitclr(); - +static void set_cursor_gcs (screen); +static void set_vt_box (screen); + #define DEFAULT -1 #define TEXT_BUF_SIZE 256 #define TRACKTIMESEC 4L @@ -3566,6 +3568,7 @@ set_vt_box (screen); } +void set_vt_box (screen) TScreen *screen; { @@ -3577,9 +3580,10 @@ (vp++)->x = -(FontWidth(screen) - 1); vp->y = -(FontHeight(screen) - 1); screen->box = VTbox; + return; } - +void set_cursor_gcs (screen) TScreen *screen; { @@ -3645,4 +3649,5 @@ screen->cursorGC = new_cursorGC; screen->reversecursorGC = new_reversecursorGC; screen->cursoroutlineGC = new_cursoroutlineGC; + return; }