diff options
| -rw-r--r-- | Makefile.common | 1 | ||||
| -rw-r--r-- | epan/Makefile.common | 5 | ||||
| -rw-r--r-- | epan/column.c (renamed from column.c) | 2 | ||||
| -rw-r--r-- | epan/column.h (renamed from column.h) | 3 | ||||
| -rw-r--r-- | epan/prefs.c | 2 | ||||
| -rw-r--r-- | file.c | 2 | ||||
| -rw-r--r-- | gtk/column_prefs.c | 2 | ||||
| -rw-r--r-- | gtk/main.c | 2 | ||||
| -rw-r--r-- | gtk/packet_list.c | 2 | ||||
| -rw-r--r-- | gtk/packet_win.c | 2 | ||||
| -rw-r--r-- | tethereal.c | 2 |
11 files changed, 12 insertions, 13 deletions
diff --git a/Makefile.common b/Makefile.common index 66d220121e..e6fbf96a77 100644 --- a/Makefile.common +++ b/Makefile.common @@ -31,7 +31,6 @@ DISSECTOR_SUPPORT_INCLUDES = \ asn1.h \ bridged_pids.h \ chdlctypes.h \ - column.h \ etypes.h \ follow.h \ format-oid.h \ diff --git a/epan/Makefile.common b/epan/Makefile.common index 46bc39a7df..0a5ed768aa 100644 --- a/epan/Makefile.common +++ b/epan/Makefile.common @@ -33,6 +33,7 @@ LIBETHEREAL_SRC = \ bitswap.c \ charsets.c \ circuit.c \ + column.c \ column-utils.c \ conversation.c \ crc16.c \ @@ -77,9 +78,10 @@ LIBETHEREAL_INCLUDES = \ bitswap.h \ charsets.h \ circuit.h \ + column.h \ column_info.h \ - conversation.h \ column-utils.h \ + conversation.h \ crc16.h \ crc32.h \ crypt-des.h \ @@ -123,7 +125,6 @@ LIBETHEREAL_INCLUDES = \ # dissector helpers (needed from the dissectors, but not a dissector itself) DISSECTOR_SUPPORT_SRC = \ ../asn1.c \ - ../column.c \ ../follow.c \ ../h225-persistentdata.c \ ../ptvcursor.c \ diff --git a/column.c b/epan/column.c index 3a37416390..aaa3f057da 100644 --- a/column.c +++ b/epan/column.c @@ -41,7 +41,7 @@ #include <epan/timestamp.h> #include <epan/prefs.h> -#include "column.h" +#include <epan/column.h> #include <epan/packet.h> /* Given a format number (as defined in packet.h), returns its equivalent diff --git a/column.h b/epan/column.h index ecb9fc0bf5..45a7b4ce29 100644 --- a/column.h +++ b/epan/column.h @@ -4,10 +4,9 @@ * $Id$ * * Ethereal - Network traffic analyzer - * By Gerald Combs <gerald@zing.org> + * By Gerald Combs <gerald@ethereal.com> * Copyright 1998 Gerald Combs * - * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 diff --git a/epan/prefs.c b/epan/prefs.c index 67832e172e..25570834ca 100644 --- a/epan/prefs.c +++ b/epan/prefs.c @@ -42,7 +42,7 @@ #include <epan/packet.h> #include <epan/prefs.h> #include <epan/proto.h> -#include "column.h" +#include <epan/column.h> #include "print.h" #include "prefs-int.h" @@ -68,7 +68,7 @@ #include "color.h" #include "color_filters.h" -#include "column.h" +#include <epan/column.h> #include <epan/packet.h> #include "packet-range.h" #include "print.h" diff --git a/gtk/column_prefs.c b/gtk/column_prefs.c index 7c4370636f..63f915917c 100644 --- a/gtk/column_prefs.c +++ b/gtk/column_prefs.c @@ -32,7 +32,7 @@ #include "column_prefs.h" #include "gtkglobals.h" #include <epan/prefs.h> -#include "column.h" +#include <epan/column.h> #include "compat_macros.h" #include "ui_util.h" diff --git a/gtk/main.c b/gtk/main.c index f9b6ed8e2b..469aca1a66 100644 --- a/gtk/main.c +++ b/gtk/main.c @@ -122,7 +122,7 @@ #include "menu.h" #include "../menu.h" #include "file_dlg.h" -#include "column.h" +#include <epan/column.h> #include "proto_draw.h" #include "keys.h" #include "packet_win.h" diff --git a/gtk/packet_list.c b/gtk/packet_list.c index 93ffb4c12f..5a20fca0a8 100644 --- a/gtk/packet_list.c +++ b/gtk/packet_list.c @@ -39,7 +39,7 @@ #include "main.h" #include "menu.h" #include "colors.h" -#include "column.h" +#include <epan/column.h> #include "epan/column_info.h" #include "compat_macros.h" #include <epan/prefs.h> diff --git a/gtk/packet_win.c b/gtk/packet_win.c index dbe3946cf8..5d5dae16a5 100644 --- a/gtk/packet_win.c +++ b/gtk/packet_win.c @@ -48,7 +48,7 @@ #include <epan/prefs.h> #include "menu.h" #include "../menu.h" -#include "column.h" +#include <epan/column.h> #include "print.h" #include <epan/addr_resolv.h> #include "packet_win.h" diff --git a/tethereal.c b/tethereal.c index 7af7592da1..b8aefe37ac 100644 --- a/tethereal.c +++ b/tethereal.c @@ -84,7 +84,7 @@ #include "file.h" #include "disabled_protos.h" #include <epan/prefs.h> -#include "column.h" +#include <epan/column.h> #include "print.h" #include <epan/addr_resolv.h> #include "util.h" |