From Harald Welte:

[obnox/wireshark/wip.git] / epan / time_fmt.h

diff --git a/epan/time_fmt.h b/epan/time_fmt.h
index d8bf151be30f7d293593514599260e8f2913c250..d6aadd5cf27d424072e189e86eef795e1ef8ef58 100644 (file)
--- a/epan/time_fmt.h
+++ b/epan/time_fmt.h
@@ -41,7 +41,8 @@ typedef enum {
  * Display format of an absolute-time time stamp.
  */
 typedef enum {
-       ABSOLUTE_TIME_LOCAL,    /* local time in our time zone, with month and day */
+       /* Start at 1000 to avoid duplicating the values used in base_display_e */
+       ABSOLUTE_TIME_LOCAL = 1000,     /* local time in our time zone, with month and day */
        ABSOLUTE_TIME_UTC,      /* UTC, with month and day */
        ABSOLUTE_TIME_DOY_UTC   /* UTC, with 1-origin day-of-year */
 } absolute_time_display_e;