Revert commit 24308 until I can get it to compile on Windows/Linux/Solaris

(strangely, it compiled fine on my MacOS X machine).


svn path=/trunk/; revision=24309

1 files changed, 3 insertions, 7 deletions

diff --git a/file.c b/file.c
index b50ab8a3df..4e5a12e8a7 100644
--- a/file.c
+++ b/file.c
@@ -77,7 +77,8 @@
 #include <epan/timestamp.h>
 #include <epan/dfilter/dfilter-macro.h>
 #include "file_util.h"
-#include <epan/column-utils.h>
+
+
 
 #ifdef HAVE_LIBPCAP
 gboolean auto_scroll_live;
@@ -938,13 +939,11 @@ add_packet_to_packet_list(frame_data *fdata, capture_file *cf,
 
 	we have tap listeners;
 
-	we have custom columns;
-
      allocate a protocol tree root node, so that we'll construct
      a protocol tree against which a filter expression can be
      evaluated. */
   if ((dfcode != NULL && refilter) || color_filters_used()
-      || num_tap_filters != 0 || have_custom_cols())
+        || num_tap_filters != 0)
 	  create_proto_tree = TRUE;
 
   /* Dissect the frame. */
@@ -957,9 +956,6 @@ add_packet_to_packet_list(frame_data *fdata, capture_file *cf,
   if (color_filters_used()) {
       color_filters_prime_edt(edt);
   }
-
-  col_custom_prime_edt(edt);
-
   tap_queue_init(edt);
   epan_dissect_run(edt, pseudo_header, buf, fdata, &cf->cinfo);
   tap_push_tapped_queue(edt);