diff options
| author | Ulf Lamping <ulf.lamping@web.de> | 2004-01-19 03:46:43 +0000 |
|---|---|---|
| committer | Ulf Lamping <ulf.lamping@web.de> | 2004-01-19 03:46:43 +0000 |
| commit | 0353c5823ffbd1e049eee11d3dc522a9d208a9c1 (patch) | |
| tree | 6ae2fd42dd8a643a3953aa79ce352427b0cceeed /epan | |
| parent | c19c7677fb6d672bf07d0988b37b7775472de590 (diff) | |
move timestamp format options from "View->Options" dialog into
menuitems under "View->Time Display Format".
renamed timestamp enum items e.g. from ABSOLUTE to TS_ABSOLUTE,
to prevent conflicting definitions with MSVC
svn path=/trunk/; revision=9729
Diffstat (limited to 'epan')
| -rw-r--r-- | epan/column-utils.c | 10 | ||||
| -rw-r--r-- | epan/timestamp.h | 22 |
2 files changed, 14 insertions, 18 deletions
diff --git a/epan/column-utils.c b/epan/column-utils.c index cebe7eb42d..95c759e817 100644 --- a/epan/column-utils.c +++ b/epan/column-utils.c @@ -1,7 +1,7 @@ /* column-utils.c * Routines for column utilities. * - * $Id: column-utils.c,v 1.41 2003/12/09 06:48:39 guy Exp $ + * $Id: column-utils.c,v 1.42 2004/01/19 03:46:41 ulfl Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -479,19 +479,19 @@ void col_set_cls_time(frame_data *fd, column_info *cinfo, int col) { switch (timestamp_type) { - case ABSOLUTE: + case TS_ABSOLUTE: col_set_abs_time(fd, cinfo, col); break; - case ABSOLUTE_WITH_DATE: + case TS_ABSOLUTE_WITH_DATE: col_set_abs_date_time(fd, cinfo, col); break; - case RELATIVE: + case TS_RELATIVE: col_set_rel_time(fd, cinfo, col); break; - case DELTA: + case TS_DELTA: col_set_delta_time(fd, cinfo, col); break; } diff --git a/epan/timestamp.h b/epan/timestamp.h index 31067e0dce..291b71feb2 100644 --- a/epan/timestamp.h +++ b/epan/timestamp.h @@ -1,7 +1,7 @@ /* timestamp.h * Defines for packet timestamps * - * $Id: timestamp.h,v 1.2 2002/08/28 20:40:45 jmayer Exp $ + * $Id: timestamp.h,v 1.3 2004/01/19 03:46:42 ulfl Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@zing.org> @@ -26,25 +26,21 @@ #ifndef __TIMESTAMP_H__ #define __TIMESTAMP_H__ -/* MS VC has these macros */ -#ifdef RELATIVE -#undef RELATIVE -#endif - -#ifdef ABSOLUTE -#undef ABSOLUTE -#endif /* * Type of time-stamp shown in the summary display. */ typedef enum { - RELATIVE, - ABSOLUTE, - ABSOLUTE_WITH_DATE, - DELTA + TS_RELATIVE, + TS_ABSOLUTE, + TS_ABSOLUTE_WITH_DATE, + TS_DELTA } ts_type; extern ts_type timestamp_type; +static char *ts_type_text[] = + { "RELATIVE", "ABSOLUTE", "ABSOLUTE_WITH_DATE", "DELTA", NULL }; + + #endif /* timestamp.h */ |