aboutsummaryrefslogtreecommitdiffstats
path: root/epan/column_info.h
diff options
context:
space:
mode:
authorStephen Fisher <steve@stephen-fisher.com>2008-02-13 05:05:33 +0000
committerStephen Fisher <steve@stephen-fisher.com>2008-02-13 05:05:33 +0000
commit8f3a1b0d16653c2e6a209680164b39910973e08d (patch)
tree39e564efcec404832a0276bcb5f4688f0a34333f /epan/column_info.h
parent7a6d8d7955a1fc471790b949eb027b770fb43cdb (diff)
Check in changes originally checked in as SVN revision 24308 (new column
type: Custom) that were backed out in SVN revision 24309. Changes since that revision include a reworking of the handling of the cfile/cinfo variables in epan/column-utils.c, addition of three new functions to libwireshark.def and a bug fix to prevent a crash when no custom columns were not in use. Compilation verified locally on MacOS X, Linux and Windows. svn path=/trunk/; revision=24317
Diffstat (limited to 'epan/column_info.h')
-rw-r--r--epan/column_info.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/epan/column_info.h b/epan/column_info.h
index a355797b99..e71c874529 100644
--- a/epan/column_info.h
+++ b/epan/column_info.h
@@ -115,6 +115,7 @@ enum {
COL_BSSGP_TLLI, /* GPRS BSSGP IE TLLI */
COL_EXPERT, /* Expert Info */
COL_FREQ_CHAN, /* IEEE 802.11 (and WiMax?) - Channel */
+ COL_CUSTOM, /* Custom column (any filter name's contents) */
NUM_COL_FMTS /* Should always be last */
};