Fix Linux compiles.

diff --git a/includes/dhcpd.h b/includes/dhcpd.h
index d9584805a4fb8223c4825d337b77f78948b97732..3b40e60a9e76b27a818641f1e496e1a32377a07e 100644 (file)
--- a/includes/dhcpd.h
+++ b/includes/dhcpd.h
@@ -1204,7 +1204,7 @@ void indent_spaces (FILE *, int);
 int if_register_socket PROTO ((struct interface_info *));
 #endif
 
-#ifdef USE_SOCKET_FALLBACK
+#if defined (USE_SOCKET_FALLBACK) && !defined (USE_SOCKET_SEND)
 void if_reinitialize_fallback PROTO ((struct interface_info *));
 void if_register_fallback PROTO ((struct interface_info *));
 ssize_t send_fallback PROTO ((struct interface_info *,
@@ -1229,11 +1229,11 @@ ssize_t receive_packet PROTO ((struct interface_info *,
                               struct sockaddr_in *, struct hardware *));
 #endif
 
-#if defined (USE_SOCKET_SEND) || defined (USE_SOCKET_FALLBACK)
+#if defined (USE_SOCKET_FALLBACK)
 isc_result_t fallback_discard PROTO ((omapi_object_t *));
 #endif
 
-#if defined (USE_SOCKET_SEND) && !defined (USE_SOCKET_FALLBACK)
+#if defined (USE_SOCKET_SEND)
 int can_unicast_without_arp PROTO ((struct interface_info *));
 int can_receive_unicast_unconfigured PROTO ((struct interface_info *));
 void maybe_setup_fallback PROTO ((void));

diff --git a/includes/osdep.h b/includes/osdep.h
index 53100f2f3eeffe56e37a39b988fdeadae4d0501f..89a29d67fe960c2a31f3ceb4d3fb6a020716e366 100644 (file)
--- a/includes/osdep.h
+++ b/includes/osdep.h
@@ -171,7 +171,9 @@
    fallback. */
 
 #if defined (USE_BPF_SEND) || defined (USE_NIT_SEND) || \
-    defined (USE_DLPI_SEND) || defined (USE_UPF_SEND) || defined (USE_LPF_SEND)
+    defined (USE_DLPI_SEND) || defined (USE_UPF_SEND) || \
+    defined (USE_LPF_SEND) || \
+    (defined (USE_SOCKET_SEND) && defined (SO_BINDTODEVICE))
 #  define USE_SOCKET_FALLBACK
 #  define USE_FALLBACK
 #endif
@@ -196,7 +198,7 @@
 
 #if defined (USE_RAW_RECEIVE) || defined (USE_BPF_SEND) || \
                defined (USE_NIT_RECEIVE) || defined (USE_UPF_RECEIVE) || \
-               defined (USE_DLPI_RECEIVE)  || defined (USE_LPF_RECEIVE)
+               defined (USE_DLPI_RECEIVE) || defined (USE_LPF_RECEIVE)
 #  define PACKET_DECODING
 #endif