summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Markwalder <tmark@isc.org>2016-03-07 09:07:43 -0500
committerThomas Markwalder <tmark@isc.org>2016-03-07 09:07:43 -0500
commitbe3ee1b92bd76a68c8921ca2e37505d268758fb1 (patch)
tree2d7b2076a942fa365d2adf204771a30a06735717
parentdfffba2dd387e603c082cacba7093424913b5c19 (diff)
downloadisc-dhcp-be3ee1b92bd76a68c8921ca2e37505d268758fb1.tar.gz
[master] Fixed mulitply defined get_hw_addr issue
includes/osdep.h - altered setting of USE_DLPI_HWADDR, it is no longer defined under Solaris when --enable-ipv4-pktinfo is specified.
-rw-r--r--includes/osdep.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/includes/osdep.h b/includes/osdep.h
index 5ae0c35a..f2b14f3c 100644
--- a/includes/osdep.h
+++ b/includes/osdep.h
@@ -100,7 +100,7 @@
#ifdef USE_SOCKETS
# define USE_SOCKET_SEND
# define USE_SOCKET_RECEIVE
-# if defined(HAVE_DLPI)
+# if defined(HAVE_DLPI) && !defined(sun) && !defined(USE_V4_PKTINFO)
# define USE_DLPI_HWADDR
# elif defined(HAVE_LPF)
# define USE_LPF_HWADDR