More news

[yaz-moved-to-github.git] / ziffy / hooks.c

diff --git a/ziffy/hooks.c b/ziffy/hooks.c
index 7645f74..54742aa 100644 (file)
--- a/ziffy/hooks.c
+++ b/ziffy/hooks.c
@@ -20,12 +20,8 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
+#define _BSD_SOURCE
 
-#if defined(linux)
-# if !defined(_BSD_SOURCE)
-#  define _BSD_SOURCE
-# endif
-#endif
 
 /*
  * Operating System include files
@@ -36,10 +32,15 @@
 #include <sys/socket.h>
 
 #include <netdb.h>
-#include <netinet/in.h>
 #include <arpa/inet.h>
 
+#if HAVE_NET_IF_H
 #include <net/if.h>
+#endif
+
+#if HAVE_NETINET_IN_H
+#include <netinet/in.h>
+#endif
 
 #if HAVE_NETINET_IF_ETHER_H
 #include <netinet/if_ether.h>
@@ -210,9 +211,9 @@ z3950apdu * pduhook (const struct pcap_pkthdr * h, const u_char * p)
       printf ("ETHER:  Total size  = %d : header = %d : data = %d\n",
              eth_size, eth_hlen, eth_size - eth_hlen),
       printf ("ETHER:  Source      = %s\n",
-             etheraddr_string (dlt == DLT_NULL ? NULL : (char *) & e -> ether_shost)),
+             etheraddr_string (dlt == DLT_NULL ? NULL : (u_char *) & e -> ether_shost)),
       printf ("ETHER:  Destination = %s\n",
-             etheraddr_string (dlt == DLT_NULL ? NULL : (char *) & e -> ether_dhost)),
+             etheraddr_string (dlt == DLT_NULL ? NULL : (u_char *) & e -> ether_dhost)),
       fflush (stdout),
       fmemdmp (stdout, (char *) e, eth_size, "Ethernet Packet");