separate list of conversation filters for logshark

Conflicts:
	CMakeLists.txt

1 files changed, 23 insertions, 1 deletions

diff --git a/epan/conversation_filter.c b/epan/conversation_filter.c
index 4379c70daa..80c35e0b66 100644
--- a/epan/conversation_filter.c
+++ b/epan/conversation_filter.c
@@ -20,7 +20,7 @@
 GList *conv_filter_list = NULL;
 
 
-void register_conversation_filter(const char *proto_name, const char *display_name,
+void do_register_conversation_filter(const char *proto_name, const char *display_name,
                                         is_filter_valid_func is_filter_valid, build_filter_string_func build_filter_string) {
     conversation_filter_t *entry;
 
@@ -34,6 +34,28 @@ void register_conversation_filter(const char *proto_name, const char *display_na
     conv_filter_list = g_list_append(conv_filter_list, entry);
 }
 
+void register_conversation_filter(const char *proto_name _U_, const char *display_name _U_,
+                                  is_filter_valid_func is_filter_valid _U_, build_filter_string_func build_filter_string _U_) {
+#ifdef LOGSHARK
+    return;
+#endif
+    return do_register_conversation_filter(proto_name,
+                                           display_name,
+                                           is_filter_valid,
+                                           build_filter_string);
+}
+
+void register_conversation_filter_logshark(const char *proto_name _U_, const char *display_name _U_,
+                                  is_filter_valid_func is_filter_valid _U_, build_filter_string_func build_filter_string _U_) {
+#ifndef LOGSHARK
+    return;
+#endif
+    return do_register_conversation_filter(proto_name,
+                                           display_name,
+                                           is_filter_valid,
+                                           build_filter_string);
+}
+
 struct conversation_filter_s* find_conversation_filter(const char *name)
 {
     GList *list_entry = conv_filter_list;