From 54cc0d86da4dcc4ae88dc767dba91dd79a545b7e Mon Sep 17 00:00:00 2001
From: Joerg Mayer <jmayer@loplof.de>
Date: Mon, 23 Jun 2014 18:44:14 +0200
Subject: Replace AF_ values by COMMON_AF_ values. Remove no longer needed
 system includes
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Change-Id: Id9ffffaa7da5185041db63fa7611d348a1cc4b68
Reviewed-on: https://code.wireshark.org/review/2577
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
---
 epan/dissectors/packet-rpcap.c | 21 +++++----------------
 1 file changed, 5 insertions(+), 16 deletions(-)

(limited to 'epan')

diff --git a/epan/dissectors/packet-rpcap.c b/epan/dissectors/packet-rpcap.c
index 7cfbbf3e70..b2f9ad0bc1 100644
--- a/epan/dissectors/packet-rpcap.c
+++ b/epan/dissectors/packet-rpcap.c
@@ -25,18 +25,7 @@
 
 #include "config.h"
 
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-
-#ifdef HAVE_SYS_SOCKET_H
-#include <sys/socket.h>
-#endif
-
-#ifdef HAVE_WINSOCK2_H
-#include <winsock2.h>
-#endif
-
+#include <epan/aftypes.h>
 #include <epan/packet.h>
 #include <epan/prefs.h>
 #include <epan/to_str.h>
@@ -298,8 +287,8 @@ static const value_string auth_type[] = {
 };
 
 static const value_string address_family[] = {
-  { AF_UNSPEC, "AF_UNSPEC" },
-  { AF_INET,   "AF_INET"   },
+  { COMMON_AF_UNSPEC,	"AF_UNSPEC" },
+  { COMMON_AF_INET,	"AF_INET"   },
   { 0,   NULL }
 };
 
@@ -418,7 +407,7 @@ dissect_rpcap_ifaddr (tvbuff_t *tvb, packet_info *pinfo,
   proto_tree_add_item (tree, hf_if_af, tvb, offset, 2, ENC_BIG_ENDIAN);
   offset += 2;
 
-  if (af == AF_INET) {
+  if (af == COMMON_AF_INET) {
     proto_tree_add_item (tree, hf_if_port, tvb, offset, 2, ENC_BIG_ENDIAN);
     offset += 2;
 
@@ -435,7 +424,7 @@ dissect_rpcap_ifaddr (tvbuff_t *tvb, packet_info *pinfo,
     offset += 120;
   } else {
     ti = proto_tree_add_item (tree, hf_if_unknown, tvb, offset, 126, ENC_NA);
-    if (af != AF_UNSPEC) {
+    if (af != COMMON_AF_UNSPEC) {
       expert_add_info_format(pinfo, ti, &ei_if_unknown,
 			      "Unknown address family: %d", af);
     }
-- 
cgit v1.2.3