diff options
| author | Bill Meier <wmeier@newsguy.com> | 2010-01-19 19:37:03 +0000 |
|---|---|---|
| committer | Bill Meier <wmeier@newsguy.com> | 2010-01-19 19:37:03 +0000 |
| commit | e0064797fb53cb60feb32bdb316a902ccca6dd07 (patch) | |
| tree | 4083fcbf1499c3b376b34133b76ef20e28e4fb58 /epan/to_str.h | |
| parent | 2efa26e0e1b9f75189b7a4f05abe3990870d6fe9 (diff) | |
Use more unique names for certain enum constants.
(enum constant names are part of the global name space).
(Fixes at least one gcc -Wshadow warning).
svn path=/trunk/; revision=31572
Diffstat (limited to 'epan/to_str.h')
| -rw-r--r-- | epan/to_str.h | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/epan/to_str.h b/epan/to_str.h index a606c620f3..a6c7c86ce0 100644 --- a/epan/to_str.h +++ b/epan/to_str.h @@ -38,13 +38,13 @@ * Resolution of a time stamp. */ typedef enum { - SECS, /* seconds */ - DSECS, /* deciseconds */ - CSECS, /* centiseconds */ - MSECS, /* milliseconds */ - USECS, /* microseconds */ - NSECS /* nanoseconds */ -} time_res_t; + TO_STR_TIME_RES_T_SECS, /* seconds */ + TO_STR_TIME_RES_T_DSECS, /* deciseconds */ + TO_STR_TIME_RES_T_CSECS, /* centiseconds */ + TO_STR_TIME_RES_T_MSECS, /* milliseconds */ + TO_STR_TIME_RES_T_USECS, /* microseconds */ + TO_STR_TIME_RES_T_NSECS /* nanoseconds */ +} to_str_time_res_t; /* * These are utility functions which convert various types to strings, @@ -76,8 +76,8 @@ extern gchar* time_secs_to_str_unsigned(guint32); extern gchar* time_msecs_to_str(gint32); extern gchar* abs_time_to_str(nstime_t*, gboolean); extern gchar* abs_time_secs_to_str(time_t, gboolean); -extern void display_signed_time(gchar *, int, gint32, gint32, time_res_t); -extern void display_epoch_time(gchar *, int, time_t, gint32, time_res_t); +extern void display_signed_time(gchar *, int, gint32, gint32, to_str_time_res_t); +extern void display_epoch_time(gchar *, int, time_t, gint32, to_str_time_res_t); extern gchar* rel_time_to_str(nstime_t*); extern gchar* rel_time_to_secs_str(nstime_t*); |