|
 |
127ea55 |
diff -ruN magicpoint-1.10a.orig/contrib/xwintoppm/dsimple.c magicpoint-1.10a/contrib/xwintoppm/dsimple.c
|
|
|
127ea55 |
--- magicpoint-1.10a.orig/contrib/xwintoppm/dsimple.c 2004-06-21 22:05:39.870925000 +0900
|
|
|
127ea55 |
+++ magicpoint-1.10a/contrib/xwintoppm/dsimple.c 2004-06-21 22:05:32.567891488 +0900
|
|
|
127ea55 |
@@ -35,6 +35,7 @@
|
|
|
127ea55 |
#include <X11/Xutil.h>
|
|
|
127ea55 |
#include <X11/cursorfont.h>
|
|
|
127ea55 |
#include <stdio.h>
|
|
|
127ea55 |
+#include <stdarg.h>
|
|
|
127ea55 |
/*
|
|
|
127ea55 |
* Other_stuff.h: Definitions of routines in other_stuff.
|
|
|
127ea55 |
*
|
|
|
127ea55 |
@@ -55,6 +56,7 @@
|
|
|
127ea55 |
void blip();
|
|
|
127ea55 |
Window Window_With_Name();
|
|
|
127ea55 |
void Fatal_Error();
|
|
|
127ea55 |
+void outl(char *msg, ...);
|
|
|
127ea55 |
|
|
|
127ea55 |
/*
|
|
|
127ea55 |
* Just_display: A group of routines designed to make the writting of simple
|
|
|
127ea55 |
@@ -496,12 +498,16 @@
|
|
|
127ea55 |
*/
|
|
|
127ea55 |
/* VARARGS1 */
|
|
|
127ea55 |
void
|
|
|
127ea55 |
-outl(msg, arg0,arg1,arg2,arg3,arg4,arg5,arg6)
|
|
|
127ea55 |
- char *msg;
|
|
|
127ea55 |
- char *arg0, *arg1, *arg2, *arg3, *arg4, *arg5, *arg6;
|
|
|
127ea55 |
+outl(char *msg, ...)
|
|
|
127ea55 |
{
|
|
|
127ea55 |
+ va_list args;
|
|
|
127ea55 |
+
|
|
|
127ea55 |
fflush(stdout);
|
|
|
127ea55 |
- fprintf(stderr, msg, arg0, arg1, arg2, arg3, arg4, arg5, arg6);
|
|
|
127ea55 |
+
|
|
|
127ea55 |
+ va_start(args, msg);
|
|
|
127ea55 |
+ vfprintf(stderr, msg, args);
|
|
|
127ea55 |
+ va_end(args);
|
|
|
127ea55 |
+
|
|
|
127ea55 |
fprintf(stderr, "\n");
|
|
|
127ea55 |
fflush(stderr);
|
|
|
127ea55 |
}
|
|
|
127ea55 |
diff -ruN magicpoint-1.10a.orig/contrib/xwintoppm/xwintoppm.c magicpoint-1.10a/contrib/xwintoppm/xwintoppm.c
|
|
|
127ea55 |
--- magicpoint-1.10a.orig/contrib/xwintoppm/xwintoppm.c 2004-06-21 22:05:39.871924000 +0900
|
|
|
127ea55 |
+++ magicpoint-1.10a/contrib/xwintoppm/xwintoppm.c 2004-06-21 22:05:32.568891356 +0900
|
|
|
127ea55 |
@@ -138,6 +138,7 @@
|
|
|
127ea55 |
|
|
|
127ea55 |
extern int (*_XErrorFunction)();
|
|
|
127ea55 |
extern int _XDefaultError();
|
|
|
127ea55 |
+void Window_Dump(Window window, FILE *out);
|
|
|
127ea55 |
|
|
|
127ea55 |
static long parse_long (s)
|
|
|
127ea55 |
char *s;
|