summaryrefslogtreecommitdiff
path: root/usr.sbin/nsd/compat
diff options
context:
space:
mode:
authorStuart Henderson <sthen@cvs.openbsd.org>2012-07-09 21:55:09 +0000
committerStuart Henderson <sthen@cvs.openbsd.org>2012-07-09 21:55:09 +0000
commit130a57e86d74176856336513144c7519bbac35c4 (patch)
tree8cbdc0272ef345051ba3180371e5d353a8b1ab91 /usr.sbin/nsd/compat
parent119d1024b76d7608135d6841393fe7fb64b0ed87 (diff)
NSD v3.2.11, ok phessler@
Diffstat (limited to 'usr.sbin/nsd/compat')
-rw-r--r--usr.sbin/nsd/compat/memcmp.c2
-rw-r--r--usr.sbin/nsd/compat/memcmp.h16
-rw-r--r--usr.sbin/nsd/compat/memmove.c2
3 files changed, 18 insertions, 2 deletions
diff --git a/usr.sbin/nsd/compat/memcmp.c b/usr.sbin/nsd/compat/memcmp.c
index 441cde9f0ba..6d3d27ac9e7 100644
--- a/usr.sbin/nsd/compat/memcmp.c
+++ b/usr.sbin/nsd/compat/memcmp.c
@@ -4,7 +4,7 @@
* Copyright (c) 2010-2011, NLnet Labs. All rights reserved.
*
* See LICENSE for the license.
-*/
+ */
#include <config.h>
diff --git a/usr.sbin/nsd/compat/memcmp.h b/usr.sbin/nsd/compat/memcmp.h
new file mode 100644
index 00000000000..c1d195ccf4a
--- /dev/null
+++ b/usr.sbin/nsd/compat/memcmp.h
@@ -0,0 +1,16 @@
+/*
+ * memcmp.h: undef memcmp for compat.
+ *
+ * Copyright (c) 2012, NLnet Labs. All rights reserved.
+ *
+ * See LICENSE for the license.
+*/
+#ifndef COMPAT_MEMCMP_H
+#define COMPAT_MEMCMP_H
+
+#ifdef memcmp
+/* undef here otherwise autoheader messes it up in config.h */
+# undef memcmp
+#endif
+
+#endif /* COMPAT_MEMCMP_H */
diff --git a/usr.sbin/nsd/compat/memmove.c b/usr.sbin/nsd/compat/memmove.c
index b52a547b447..fd65a93f84e 100644
--- a/usr.sbin/nsd/compat/memmove.c
+++ b/usr.sbin/nsd/compat/memmove.c
@@ -4,7 +4,7 @@
* Copyright (c) 2001-2011, NLnet Labs. All rights reserved.
*
* See LICENSE for the license.
-*/
+ */
#include <config.h>
#include <stdlib.h>