summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKevin Steves <stevesk@cvs.openbsd.org>2006-12-12 19:38:56 +0000
committerKevin Steves <stevesk@cvs.openbsd.org>2006-12-12 19:38:56 +0000
commit81389cac73f597d60ace5e78df40a5f919283e17 (patch)
tree4585d4ec7abe49ff0dac42940bf0a9afa4b4e69d
parentfca850927ea9db8c602a758a05228c6f3eadb070 (diff)
remove unused #defines; no binary change
-rw-r--r--usr.sbin/dhcpd/dispatch.c9
-rw-r--r--usr.sbin/dhcpd/options.c3
2 files changed, 2 insertions, 10 deletions
diff --git a/usr.sbin/dhcpd/dispatch.c b/usr.sbin/dhcpd/dispatch.c
index 4285a1f3d39..1d371e3c153 100644
--- a/usr.sbin/dhcpd/dispatch.c
+++ b/usr.sbin/dhcpd/dispatch.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: dispatch.c,v 1.21 2006/05/30 23:43:46 ckuethe Exp $ */
+/* $OpenBSD: dispatch.c,v 1.22 2006/12/12 19:38:55 stevesk Exp $ */
/*
* Copyright (c) 1995, 1996, 1997, 1998, 1999
@@ -44,10 +44,6 @@
#include <poll.h>
#include <net/if_media.h>
-
-/* Most boxes has less than 16 interfaces, so this might be a good guess. */
-#define INITIAL_IFREQ_COUNT 16
-
struct interface_info *interfaces;
struct protocol *protocols;
struct dhcpd_timeout *timeouts;
@@ -74,9 +70,6 @@ discover_interfaces(void)
int ir = 0;
struct ifreq *tif;
struct ifaddrs *ifap, *ifa;
-#ifdef ALIAS_NAMES_PERMUTED
- char *s;
-#endif
if (getifaddrs(&ifap) != 0)
error("getifaddrs failed");
diff --git a/usr.sbin/dhcpd/options.c b/usr.sbin/dhcpd/options.c
index a6ec56d26fe..fbfd5c11d5b 100644
--- a/usr.sbin/dhcpd/options.c
+++ b/usr.sbin/dhcpd/options.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: options.c,v 1.6 2004/09/21 04:07:04 david Exp $ */
+/* $OpenBSD: options.c,v 1.7 2006/12/12 19:38:55 stevesk Exp $ */
/* DHCP options parsing and reassembly. */
@@ -42,7 +42,6 @@
#include <ctype.h>
-#define DHCP_OPTION_DATA
#include "dhcpd.h"
int bad_options = 0;