diff options
| author | ulfl <ulfl@f5534014-38df-0310-8fa8-9805f1628bb7> | 2004-01-19 03:46:43 +0000 |
|---|---|---|
| committer | ulfl <ulfl@f5534014-38df-0310-8fa8-9805f1628bb7> | 2004-01-19 03:46:43 +0000 |
| commit | 3e1c2030ccb8a650d8a7197fe2d77bacf7507e36 (patch) | |
| tree | 6ae2fd42dd8a643a3953aa79ce352427b0cceeed /epan/timestamp.h | |
| parent | fe8fa11fdaf3a891596fb21375eea0b0625fb3b9 (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
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@9729 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'epan/timestamp.h')
| -rw-r--r-- | epan/timestamp.h | 22 |
1 files changed, 9 insertions, 13 deletions
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 */ |