From 68eb1ecd9e7565d6e265d4cca2b666e8c017dd53 Mon Sep 17 00:00:00 2001
From: Daniel Borkmann <dborkman@redhat.com>
Date: Thu, 11 Jul 2013 15:15:20 +0200
Subject: dissector: rename __WITH_PROTOS into HAVE_DISSECTOR_PROTOS

To be more consistent with config.h, rename __WITH_PROTOS into
HAVE_DISSECTOR_PROTOS.

Signed-off-by: Daniel Borkmann <dborkman@redhat.com>
---
 dissector_80211.c    | 4 ++--
 dissector_80211.h    | 4 ++--
 dissector_eth.c      | 4 ++--
 dissector_eth.h      | 4 ++--
 netsniff-ng/Makefile | 2 +-
 trafgen/Makefile     | 3 +--
 6 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/dissector_80211.c b/dissector_80211.c
index f3d8b62..f39a8a2 100644
--- a/dissector_80211.c
+++ b/dissector_80211.c
@@ -16,7 +16,7 @@
 
 struct hash_table ieee80211_lay2;
 
-#ifdef __WITH_PROTOS
+#ifdef HAVE_DISSECTOR_PROTOS
 static inline void dissector_init_entry(int type)
 {
 	dissector_set_print_type(&ieee80211_ops, type);
@@ -37,7 +37,7 @@ static void dissector_init_layer_2(int type)
 static inline void dissector_init_entry(int type) {}
 static inline void dissector_init_exit(int type) {}
 static void dissector_init_layer_2(int type) {}
-#endif /* __WITH_PROTOS */
+#endif
 
 void dissector_init_ieee80211(int fnttype)
 {
diff --git a/dissector_80211.h b/dissector_80211.h
index 53059e5..31e1965 100644
--- a/dissector_80211.h
+++ b/dissector_80211.h
@@ -18,7 +18,7 @@ extern struct hash_table ieee80211_lay2;
 extern void dissector_init_ieee80211(int fnttype);
 extern void dissector_cleanup_ieee80211(void);
 
-#ifdef __WITH_PROTOS
+#ifdef HAVE_DISSECTOR_PROTOS
 static inline struct protocol *dissector_get_ieee80211_entry_point(void)
 {
 	return &ieee80211_ops;
@@ -38,5 +38,5 @@ static inline struct protocol *dissector_get_ieee80211_exit_point(void)
 {
 	return NULL;
 }
-#endif /* __WITH_PROTOS */
+#endif
 #endif /* DISSECTOR_80211_H */
diff --git a/dissector_eth.c b/dissector_eth.c
index 3686fb9..41af9d2 100644
--- a/dissector_eth.c
+++ b/dissector_eth.c
@@ -53,7 +53,7 @@ char *lookup_ether_type(unsigned int id)
 	return __do_lookup_inline(id, port, &eth_ether_types, port);
 }
 
-#ifdef __WITH_PROTOS
+#ifdef HAVE_DISSECTOR_PROTOS
 static inline void dissector_init_entry(int type)
 {
 	dissector_set_print_type(&ethernet_ops, type);
@@ -101,7 +101,7 @@ static inline void dissector_init_entry(int type) {}
 static inline void dissector_init_exit(int type) {}
 static void dissector_init_layer_2(int type) {}
 static void dissector_init_layer_3(int type) {}
-#endif /* __WITH_PROTOS */
+#endif
 
 enum ports {
 	PORTS_UDP,
diff --git a/dissector_eth.h b/dissector_eth.h
index 85106bc..45d3b6c 100644
--- a/dissector_eth.h
+++ b/dissector_eth.h
@@ -23,7 +23,7 @@ extern char *lookup_port_udp(unsigned int id);
 extern char *lookup_port_tcp(unsigned int id);
 extern char *lookup_ether_type(unsigned int id);
 
-#ifdef __WITH_PROTOS
+#ifdef HAVE_DISSECTOR_PROTOS
 static inline struct protocol *dissector_get_ethernet_entry_point(void)
 {
 	return &ethernet_ops;
@@ -43,5 +43,5 @@ static inline struct protocol *dissector_get_ethernet_exit_point(void)
 {
 	return NULL;
 }
-#endif /* __WITH_PROTOS */
+#endif
 #endif /* DISSECTOR_ETH_H */
diff --git a/netsniff-ng/Makefile b/netsniff-ng/Makefile
index fa4976d..683db4f 100644
--- a/netsniff-ng/Makefile
+++ b/netsniff-ng/Makefile
@@ -75,4 +75,4 @@ endif
 
 netsniff-ng-eflags = $(shell pkg-config --cflags libnl-3.0) \
 		     $(shell pkg-config --cflags libnl-genl-3.0) \
-		     -D__WITH_PROTOS
+		     -DHAVE_DISSECTOR_PROTOS
diff --git a/trafgen/Makefile b/trafgen/Makefile
index f822fb9..a7bf6c4 100644
--- a/trafgen/Makefile
+++ b/trafgen/Makefile
@@ -26,5 +26,4 @@ trafgen-yaac =	trafgen_parser.tab.o
 
 trafgen-eflags = $(shell pkg-config --cflags libnl-3.0) \
 		 $(shell pkg-config --cflags libnl-genl-3.0) \
-		 -I.. \
-		 -D__WITH_PROTOS
+		 -DHAVE_DISSECTOR_PROTOS -I..
-- 
cgit v1.2.3-54-g00ecf