freebsd-ports/japanese/prn/files/patch-prn.c
Mark Linimon 5a5697333d Unbreak build by fixing varargs problem on gcc3.3.
PR:		ports/62391
Submitted by:	Hiroki Sato <hrs@freebsd.org>
Maintainer timeout:	4 weeks
2004-03-04 05:09:28 +00:00

60 lines
1.4 KiB
C

--- prn.c.orig Thu May 26 11:37:45 1994
+++ prn.c Fri Feb 6 00:18:11 2004
@@ -34,8 +34,13 @@
#include <sys/stat.h>
#include "euc.h"
+#if !defined KCCPATH
#define KCCPATH "/usr/local/bin/kcc"
-#if defined (__bsdi__)
+#endif
+#if (defined(__unix__) || defined(unix)) && !defined(USG)
+#include <sys/param.h>
+#endif
+#if defined (__bsdi__) || (defined(BSD) && (BSD >= 199103))
#define LPRPATH "/usr/bin/lpr"
#else
#define LPRPATH "/usr/ucb/lpr"
@@ -48,8 +53,12 @@
#else
+#if !defined CMTPATH
#define CMTPATH "/usr/local/bin/cmt"
+#endif
+#if !defined PSPATH
#define PSPATH "/usr/local/bin/psconv"
+#endif
#endif
@@ -96,7 +105,7 @@
static char *filename; /* name of the file being processed */
static char *modtime; /* the last modification time */
-static void error();
+static void error(char *, ...);
static char *basename();
static bool formatopt();
static bool rangeopt();
@@ -498,16 +507,15 @@
error(format, arg1, arg2, ...)
char *format;
---------------------------------------------------------------------*/
-#include <varargs.h>
+#include <stdarg.h>
-static void error(va_alist)
- va_dcl
+static void error(char *a, ...)
{
va_list args;
- va_start(args);
+ va_start(args, a);
fprintf(stderr, "%s: ", progname);
- vfprintf(stderr, va_arg(args, char *), args);
+ vfprintf(stderr, a, args);
putc('\n', stderr);
va_end(args);
exit(1);