File pcb-1.6.3-stdarg.patch of Package pcb
--- src/dev_gerber.c
+++ src/dev_gerber.c
@@ -125,7 +125,7 @@
#include <sys/types.h>
#include <errno.h>
#include <unistd.h>
-#include <varargs.h>
+#include <stdarg.h>
#include "global.h"
@@ -288,15 +288,12 @@
/*----------------------------------------------------------------------------*/
/* Error Logging Routines */
/*----------------------------------------------------------------------------*/
-static void logError(fp, format, va_alist)
- FILE *fp;
- char *format;
- va_dcl
+static void logError(FILE *fp, char *format, ...)
{
va_list args;
char s[1024];
- va_start(args);
+ va_start(args, format);
vsprintf(s, format, args);
fputs(s, fp);
va_end(args);
--- src/dev_rs274x.c
+++ src/dev_rs274x.c
@@ -51,7 +51,7 @@
#include <sys/types.h>
#include <errno.h>
#include <unistd.h>
-#include <varargs.h>
+#include <stdarg.h>
#include "global.h"
@@ -218,10 +218,7 @@
/*----------------------------------------------------------------------------*/
/* Error Logging Routines */
/*----------------------------------------------------------------------------*/
-static void logError(fp, format, va_alist)
- FILE *fp;
- char *format;
- va_dcl
+static void logError(FILE *fp, char *format, ...)
{
va_list args;
char s[1024];
@@ -229,7 +226,7 @@
/* FIXME: Is it legitimate to use Message() from within a
driver? */
- va_start(args);
+ va_start(args, format);
vsprintf(s, format, args);
fputs(s, fp);
/*
--- src/error.c
+++ src/error.c
@@ -30,11 +30,10 @@
* getpid() needs a cast to (int) to get rid of compiler warnings
* on several architectures
*/
-
#include <stdio.h>
#include <stdlib.h>
#include <errno.h>
-#include <varargs.h>
+#include <stdarg.h>
#include <signal.h>
#include <unistd.h>
#include <fcntl.h>
@@ -68,15 +67,13 @@
/* ---------------------------------------------------------------------------
* output of message in a dialog window or log window
*/
-void Message(Format, va_alist)
-char *Format;
-va_dcl
+void Message(char *Format, ...)
{
va_list args;
char s[1024];
XEvent event;
- va_start(args);
+ va_start(args, Format);
vsprintf(s, Format, args);
va_end(args);
@@ -156,9 +153,7 @@
/* ---------------------------------------------------------------------------
* output of fatal error message
*/
-void MyFatal(Format, va_alist)
-char *Format;
-va_dcl
+void MyFatal(char *Format, ...)
{
va_list args;
@@ -166,7 +161,7 @@
RestoreStderr();
EmergencySave();
- va_start(args);
+ va_start(args, Format);
fprintf(stderr, "%s (%i): fatal, ", Progname, (int) getpid());
vfprintf(stderr, Format, args);
fflush(stderr);
--- src/error.h
+++ src/error.h
@@ -37,13 +37,13 @@
#define STATUS_BREAK 1
#define STATUS_ERROR -1
-void Message();
+void Message(char *, ...);
void OpenErrorMessage(char *);
void PopenErrorMessage(char *);
void OpendirErrorMessage(char *);
void ChdirErrorMessage(char *);
void RestoreStderr(void);
-void MyFatal();
+void MyFatal(char *, ...);
void CatchSignal(int);
void X11ErrorHandler(String);
void InitErrorLog(void);