msvc fixes

svn path=/trunk/; revision=19129
This commit is contained in:
Steven Edwards 2005-11-11 08:58:05 +00:00
parent dded32cc5e
commit 0a977ed9f1
3 changed files with 3 additions and 44 deletions

View file

@ -50,21 +50,10 @@ static char sccsid[] = "@(#)err.c 8.1 (Berkeley) 6/4/93";
extern char *__progname; /* Program name, from crt0. */ extern char *__progname; /* Program name, from crt0. */
void void
#ifdef __STDC__
err(int eval, const char *fmt, ...) err(int eval, const char *fmt, ...)
#else
err(eval, fmt, va_alist)
int eval;
const char *fmt;
va_dcl
#endif
{ {
va_list ap; va_list ap;
#if __STDC__
va_start(ap, fmt); va_start(ap, fmt);
#else
va_start(ap);
#endif
verr(eval, fmt, ap); verr(eval, fmt, ap);
va_end(ap); va_end(ap);
} }
@ -85,21 +74,10 @@ verr(int eval, const char *fmt, va_list ap)
} }
void void
#if __STDC__
errx(int eval, const char *fmt, ...) errx(int eval, const char *fmt, ...)
#else
errx(eval, fmt, va_alist)
int eval;
const char *fmt;
va_dcl
#endif
{ {
va_list ap; va_list ap;
#if __STDC__
va_start(ap, fmt); va_start(ap, fmt);
#else
va_start(ap);
#endif
verrx(eval, fmt, ap); verrx(eval, fmt, ap);
va_end(ap); va_end(ap);
} }
@ -115,20 +93,10 @@ verrx(int eval, const char *fmt, va_list ap)
} }
void void
#if __STDC__
warn(const char *fmt, ...) warn(const char *fmt, ...)
#else
warn(fmt, va_alist)
const char *fmt;
va_dcl
#endif
{ {
va_list ap; va_list ap;
#if __STDC__
va_start(ap, fmt); va_start(ap, fmt);
#else
va_start(ap);
#endif
vwarn(fmt, ap); vwarn(fmt, ap);
va_end(ap); va_end(ap);
} }
@ -150,20 +118,10 @@ vwarn(fmt, ap)
} }
void void
#ifdef __STDC__
warnx(const char *fmt, ...) warnx(const char *fmt, ...)
#else
warnx(fmt, va_alist)
const char *fmt;
va_dcl
#endif
{ {
va_list ap; va_list ap;
#ifdef __STDC__
va_start(ap, fmt); va_start(ap, fmt);
#else
va_start(ap);
#endif
vwarnx(fmt, ap); vwarnx(fmt, ap);
va_end(ap); va_end(ap);
} }

View file

@ -62,7 +62,6 @@
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <time.h> #include <time.h>
#include "unistd.h"
#include "various.h" #include "various.h"
#include "getopt.h" #include "getopt.h"

View file

@ -35,13 +35,15 @@
*/ */
#include <sys/types.h> #include <sys/types.h>
#include <winsock2.h> #include <winsock2.h>
#include "unistd.h"
#include <stdio.h> #include <stdio.h>
#include <ctype.h> #include <ctype.h>
#include <string.h> #include <string.h>
#include "various.h" #include "various.h"
int close(int);
void void
netfinger(char *name) netfinger(char *name)
{ {