diff options
| author | peter <peter@FreeBSD.org> | 2003-05-12 18:51:31 +0000 |
|---|---|---|
| committer | peter <peter@FreeBSD.org> | 2003-05-12 18:51:31 +0000 |
| commit | b8b7c5f0c7ae14b72795f297b0da57c8df3238d5 (patch) | |
| tree | 40f972d87240c97debdb63b482c6b8c7d1b14b95 /usr.sbin | |
| parent | fbf228660c14a822c02d75ffd63c043133e49a6c (diff) | |
| download | FreeBSD-src-b8b7c5f0c7ae14b72795f297b0da57c8df3238d5.zip FreeBSD-src-b8b7c5f0c7ae14b72795f297b0da57c8df3238d5.tar.gz | |
Add __amd64__ to an ifdef set so that pppd compiles. Reactivate on amd64.
Approved by: re (amd64 "safe" ifdefs etc)
Diffstat (limited to 'usr.sbin')
| -rw-r--r-- | usr.sbin/Makefile | 4 | ||||
| -rw-r--r-- | usr.sbin/pppd/main.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/usr.sbin/Makefile b/usr.sbin/Makefile index 354a289..38f02b3 100644 --- a/usr.sbin/Makefile +++ b/usr.sbin/Makefile @@ -74,6 +74,7 @@ SUBDIR= IPXrouted \ pciconf \ periodic \ pkg_install \ + pppd \ pppstats \ procctl \ pstat \ @@ -133,8 +134,7 @@ SUBDIR= IPXrouted \ zic .if ${MACHINE_ARCH} != "amd64" -SUBDIR+=ppp \ - pppd +SUBDIR+=ppp .endif .if !defined(NO_IPFILTER) diff --git a/usr.sbin/pppd/main.c b/usr.sbin/pppd/main.c index 980064b..c2d0abf 100644 --- a/usr.sbin/pppd/main.c +++ b/usr.sbin/pppd/main.c @@ -1530,7 +1530,7 @@ vfmtmsg(buf, buflen, fmt, args) break; case 'r': f = va_arg(args, char *); -#ifndef __powerpc__ +#if !defined(__powerpc__) && !defined(__amd64__) n = vfmtmsg(buf, buflen + 1, f, va_arg(args, va_list)); #else /* On the powerpc, a va_list is an array of 1 structure */ |
