summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorragge <ragge@openbsd.org>2008-06-29 16:00:22 +0000
committerragge <ragge@openbsd.org>2008-06-29 16:00:22 +0000
commit69a3465ee391ad7127d8e8e74aa05e0d54e82b50 (patch)
tree8f11944e840691922b50e534c40c7f34ca7c47c4
parentDon't fail compilation if APERTURE is not defined. (diff)
downloadwireguard-openbsd-69a3465ee391ad7127d8e8e74aa05e0d54e82b50.tar.xz
wireguard-openbsd-69a3465ee391ad7127d8e8e74aa05e0d54e82b50.zip
Use C99, not gcc-specific variadics. Ok miod@.
-rw-r--r--usr.sbin/snmpd/ber.c6
-rw-r--r--usr.sbin/snmpd/snmpd.h8
2 files changed, 7 insertions, 7 deletions
diff --git a/usr.sbin/snmpd/ber.c b/usr.sbin/snmpd/ber.c
index a0dd11efab3..e3944690b7f 100644
--- a/usr.sbin/snmpd/ber.c
+++ b/usr.sbin/snmpd/ber.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ber.c,v 1.14 2008/03/18 16:57:58 reyk Exp $ */
+/* $OpenBSD: ber.c,v 1.15 2008/06/29 16:00:22 ragge Exp $ */
/*
* Copyright (c) 2007 Reyk Floeter <reyk@vantronix.net>
@@ -53,9 +53,9 @@ static ssize_t ber_getc(struct ber *b, u_char *c);
static ssize_t ber_read(struct ber *ber, void *buf, size_t len);
#ifdef DEBUG
-#define DPRINTF(x...) printf(x)
+#define DPRINTF(...) printf(__VA_ARGS__)
#else
-#define DPRINTF(x...) do { } while (0)
+#define DPRINTF(...) do { } while (0)
#endif
struct ber_element *
diff --git a/usr.sbin/snmpd/snmpd.h b/usr.sbin/snmpd/snmpd.h
index 1567b57205b..3a0fe23babe 100644
--- a/usr.sbin/snmpd/snmpd.h
+++ b/usr.sbin/snmpd/snmpd.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: snmpd.h,v 1.18 2008/02/07 11:33:26 reyk Exp $ */
+/* $OpenBSD: snmpd.h,v 1.19 2008/06/29 16:00:22 ragge Exp $ */
/*
* Copyright (c) 2007, 2008 Reyk Floeter <reyk@vantronix.net>
@@ -234,9 +234,9 @@ struct oid {
(((_oid)->o_flags & OID_IFSET) && \
((_oid)->o_data == NULL) && ((_oid)->o_val == 0))
-#define OID(_mib...) { { _mib } }
-#define MIBDECL(_mib...) { { MIB_##_mib } }, #_mib
-#define MIB(_mib...) { { MIB_##_mib } }, NULL
+#define OID(...) { { __VA_ARGS__ } }
+#define MIBDECL(...) { { MIB_##__VA_ARGS__ } }, #__VA_ARGS__
+#define MIB(...) { { MIB_##__VA_ARGS__ } }, NULL
#define MIBEND { { 0 } }, NULL
/*