fix Win32 build

[ghc-hetmet.git] / ghc / utils / hp2ps / Error.c

diff --git a/ghc/utils/hp2ps/Error.c b/ghc/utils/hp2ps/Error.c
index bdbb43d..809c24e 100644 (file)
--- a/ghc/utils/hp2ps/Error.c
+++ b/ghc/utils/hp2ps/Error.c
@@ -1,46 +1,50 @@
-#include <stdio.h>
 #include "Main.h"
+#include <stdarg.h>
+#include <stdio.h>
+#include <stdlib.h>
 #include "Defines.h"
 
 /* own stuff */
 #include "Error.h"
 
-extern void exit PROTO((int));
-
 /*VARARGS0*/
 void
-Error(a1,a2,a3,a4)
-  char* a1; char* a2; char* a3; char* a4;
+Error(const char *fmt, ...)
 {
+    va_list ap;
     fflush(stdout);
     fprintf(stderr, "%s: ", programname);
-    fprintf(stderr, a1, a2, a3, a4);
+    va_start(ap, fmt);
+    vfprintf(stderr, fmt, ap);
+    va_end(ap);
     fprintf(stderr, "\n");
     exit(1);
 }
 
 /*VARARGS0*/
 void
-Disaster(a1,a2,a3,a4)
-  char* a1; char* a2; char* a3; char* a4;
+Disaster(const char *fmt, ...)
 {
+    va_list ap;
     fflush(stdout);
     fprintf(stderr, "%s: ", programname);
-    fprintf(stderr, " Disaster! ("); 
-    fprintf(stderr, a1, a2, a3, a4);
+    fprintf(stderr, " Disaster! (");
+    va_start(ap, fmt);
+    vfprintf(stderr, fmt, ap);
+    va_end(ap);
     fprintf(stderr, ")\n");
     exit(1);
 }
 
 void
 Usage(str)
-  char *str;
+  const char *str;
 {
    if (str) printf("error: %s\n", str);
    printf("usage: %s -b -d -ef -g -i -p -mn -p -s -tf -y [file[.hp]]\n", programname);
    printf("where -b  use large title box\n");
    printf("      -d  sort by standard deviation\n"); 
-   printf("      -ef[in|mm|pt] produce Encapsulated PostScript f units wide\n");
+   printf("      -ef[in|mm|pt] produce Encapsulated PostScript f units wide (f > 2 inches)\n");
    printf("      -g  produce output suitable for GHOSTSCRIPT previever\n");
    printf("      -i[+|-] sort by identifier string (-i+ gives greatest on top) \n"); 
    printf("      -mn print maximum of n bands (default & max 20)\n");