Don't use g_assert_cmpuint, its definition breaks the Windows

[metze/wireshark/wip.git] / epan / timestamp.h

diff --git a/epan/timestamp.h b/epan/timestamp.h
index 291b71feb25ac973f9cd5aafe66d191f562a021c..0992b3eaa0b2157da6176e1591b91f8c52c7f6fe 100644 (file)
--- a/epan/timestamp.h
+++ b/epan/timestamp.h
@@ -1,13 +1,12 @@
 /* timestamp.h
  * Defines for packet timestamps
  *
- * $Id: timestamp.h,v 1.3 2004/01/19 03:46:42 ulfl Exp $
+ * $Id$
  *
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@zing.org>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
  * 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
@@ -20,27 +19,76 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
 #ifndef __TIMESTAMP_H__
 #define __TIMESTAMP_H__
 
+#include "ws_symbol_export.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
 
 /*
  * Type of time-stamp shown in the summary display.
  */
 typedef enum {
-       TS_RELATIVE,
+       TS_RELATIVE,            /* Since start of capture */
        TS_ABSOLUTE,
        TS_ABSOLUTE_WITH_DATE,
-       TS_DELTA
+       TS_DELTA,               /* Since previous captured packet */
+       TS_DELTA_DIS,           /* Since previous displayed packet */
+       TS_EPOCH,               /* Seconds (and fractions) since epoch */
+       TS_UTC,
+       TS_UTC_WITH_DATE,
+
+/*
+ * Special value used for the command-line setting in Wireshark, to indicate
+ * that no value has been set from the command line.
+ */
+       TS_NOT_SET
 } ts_type;
 
-extern ts_type timestamp_type;
+typedef enum {
+       TS_PREC_AUTO,           /* recent */
+       TS_PREC_FIXED_SEC,      /* recent and internal */
+       TS_PREC_FIXED_DSEC,     /* recent and internal */
+       TS_PREC_FIXED_CSEC,     /* recent and internal */
+       TS_PREC_FIXED_MSEC,     /* recent and internal */
+       TS_PREC_FIXED_USEC,     /* recent and internal */
+       TS_PREC_FIXED_NSEC,     /* recent and internal */
+       TS_PREC_AUTO_SEC,       /* internal */
+       TS_PREC_AUTO_DSEC,      /* internal */
+       TS_PREC_AUTO_CSEC,      /* internal */
+       TS_PREC_AUTO_MSEC,      /* internal */
+       TS_PREC_AUTO_USEC,      /* internal */
+       TS_PREC_AUTO_NSEC       /* internal */
+} ts_precision;
+
+typedef enum {
+       TS_SECONDS_DEFAULT,     /* recent */
+       TS_SECONDS_HOUR_MIN_SEC,/* recent */
+
+/*
+ * Special value used for the command-line setting in Wireshark, to indicate
+ * that no value has been set from the command line.
+ */
+       TS_SECONDS_NOT_SET
+} ts_seconds_type;
+
+WS_DLL_PUBLIC ts_type timestamp_get_type(void);
+WS_DLL_PUBLIC void timestamp_set_type(ts_type);
+
+WS_DLL_PUBLIC int timestamp_get_precision(void);
+WS_DLL_PUBLIC void timestamp_set_precision(int tsp);
 
-static char *ts_type_text[] =
-       { "RELATIVE", "ABSOLUTE", "ABSOLUTE_WITH_DATE", "DELTA", NULL };
+WS_DLL_PUBLIC ts_seconds_type timestamp_get_seconds_type(void);
+WS_DLL_PUBLIC void timestamp_set_seconds_type(ts_seconds_type);
 
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
 
 #endif /* timestamp.h */