119 lines
2.1 KiB
Text
119 lines
2.1 KiB
Text
$NetBSD: patch-aj,v 1.1 2006/06/14 09:07:45 rillig Exp $
|
|
|
|
--- hc.c.orig 2006-06-15 07:57:40.000000000 +0200
|
|
+++ hc.c 2006-06-15 08:27:52.000000000 +0200
|
|
@@ -51,12 +51,15 @@
|
|
|
|
#define INCLUDE_COMMON /* tell helpcom.h to include common code */
|
|
|
|
+#if !defined(USE_VARARGS)
|
|
+#include <stdarg.h>
|
|
+#else
|
|
+#include <varargs.h>
|
|
+#endif
|
|
|
|
#ifndef XFRACT
|
|
#include <io.h>
|
|
-#include <stdarg.h>
|
|
#else
|
|
-#include <varargs.h>
|
|
#define strupr strlwr
|
|
#endif
|
|
#include <fcntl.h>
|
|
@@ -295,7 +298,7 @@ void print_msg(char *type, int lnum, cha
|
|
}
|
|
|
|
|
|
-#ifndef XFRACT
|
|
+#if !defined(USE_VARARGS)
|
|
void fatal(int diff, char *format, ...)
|
|
#else
|
|
void fatal(va_alist)
|
|
@@ -304,7 +307,7 @@ void fatal(va_alist)
|
|
{
|
|
va_list arg;
|
|
|
|
-#ifndef XFRACT
|
|
+#if !defined(USE_VARARGS)
|
|
va_start(arg, format);
|
|
#else
|
|
int diff;
|
|
@@ -324,7 +327,7 @@ void fatal(va_alist)
|
|
}
|
|
|
|
|
|
-#ifndef XFRACT
|
|
+#if !defined(USE_VARARGS)
|
|
void error(int diff, char *format, ...)
|
|
#else
|
|
void error(va_alist)
|
|
@@ -333,7 +336,7 @@ void error(va_alist)
|
|
{
|
|
va_list arg;
|
|
|
|
-#ifndef XFRACT
|
|
+#if !defined(USE_VARARGS)
|
|
va_start(arg, format);
|
|
#else
|
|
int diff;
|
|
@@ -350,7 +353,7 @@ void error(va_alist)
|
|
}
|
|
|
|
|
|
-#ifndef XFRACT
|
|
+#if !defined(USE_VARARGS)
|
|
void warn(int diff, char *format, ...)
|
|
#else
|
|
void warn(va_alist)
|
|
@@ -358,7 +361,7 @@ void warn(va_alist)
|
|
#endif
|
|
{
|
|
va_list arg;
|
|
-#ifndef XFRACT
|
|
+#if !defined(USE_VARARGS)
|
|
va_start(arg, format);
|
|
#else
|
|
int diff;
|
|
@@ -375,7 +378,7 @@ void warn(va_alist)
|
|
}
|
|
|
|
|
|
-#ifndef XFRACT
|
|
+#if !defined(USE_VARARGS)
|
|
void notice(char *format, ...)
|
|
#else
|
|
void notice(va_alist)
|
|
@@ -383,7 +386,7 @@ void notice(va_alist)
|
|
#endif
|
|
{
|
|
va_list arg;
|
|
-#ifndef XFRACT
|
|
+#if !defined(USE_VARARGS)
|
|
va_start(arg, format);
|
|
#else
|
|
char *format;
|
|
@@ -396,7 +399,7 @@ void notice(va_alist)
|
|
}
|
|
|
|
|
|
-#ifndef XFRACT
|
|
+#if !defined(USE_VARARGS)
|
|
void msg(char *format, ...)
|
|
#else
|
|
void msg(va_alist)
|
|
@@ -404,13 +407,13 @@ va_dcl
|
|
#endif
|
|
{
|
|
va_list arg;
|
|
-#ifdef XFRACT
|
|
+#if defined(USE_VARARGS)
|
|
char *format;
|
|
#endif
|
|
|
|
if (quiet_mode)
|
|
return;
|
|
-#ifndef XFRACT
|
|
+#if !defined(USE_VARARGS)
|
|
va_start(arg, format);
|
|
#else
|
|
va_start(arg);
|