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 ac06c6b63c4aa45966fd2bec48421476e2854535..0992b3eaa0b2157da6176e1591b91f8c52c7f6fe 100644 (file)
--- a/epan/timestamp.h
+++ b/epan/timestamp.h
@@ -19,22 +19,33 @@
  *
  * 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 Ethereal, to indicate
+ * 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
@@ -45,7 +56,7 @@ typedef enum {
        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_MSEC,     /* recent and internal */
        TS_PREC_FIXED_USEC,     /* recent and internal */
        TS_PREC_FIXED_NSEC,     /* recent and internal */
        TS_PREC_AUTO_SEC,       /* internal */
@@ -56,10 +67,28 @@ typedef enum {
        TS_PREC_AUTO_NSEC       /* internal */
 } ts_precision;
 
-extern ts_type timestamp_get_type(void);
-extern void timestamp_set_type(ts_type);
+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);
+
+WS_DLL_PUBLIC ts_seconds_type timestamp_get_seconds_type(void);
+WS_DLL_PUBLIC void timestamp_set_seconds_type(ts_seconds_type);
 
-extern int timestamp_get_precision(void);
-extern void timestamp_set_precision(int tsp);
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
 
 #endif /* timestamp.h */