Merging upstream version 4.4.0.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 11 insertions, 11 deletions

diff --git a/epan/rtd_table.h b/epan/rtd_table.h
index a4679a09..e7d38283 100644
--- a/epan/rtd_table.h
+++ b/epan/rtd_table.h
@@ -22,18 +22,18 @@ extern "C" {
 #endif /* __cplusplus */
 
 typedef struct _rtd_timestat {
-	guint num_timestat;              /**< number of elements on rtd array */
+	unsigned num_timestat;              /**< number of elements on rtd array */
 	timestat_t* rtd;
-	guint32 open_req_num;
-	guint32 disc_rsp_num;
-	guint32 req_dup_num;
-	guint32 rsp_dup_num;
+	uint32_t open_req_num;
+	uint32_t disc_rsp_num;
+	uint32_t req_dup_num;
+	uint32_t rsp_dup_num;
 } rtd_timestat;
 
 /** Statistics table */
 typedef struct _rtd_stat_table {
 	char *filter;
-	guint num_rtds;              /**< number of elements on time_stats array */
+	unsigned num_rtds;              /**< number of elements on time_stats array */
 	rtd_timestat* time_stats;
 } rtd_stat_table;
 
@@ -61,7 +61,7 @@ typedef void (*rtd_filter_check_cb)(const char *opt_arg, const char **filter, ch
  * @param rtd_packet_func the tap processing function
  * @param filter_check_cb callback for verification of filter or other dissector checks
  */
-WS_DLL_PUBLIC void register_rtd_table(const int proto_id, const char* tap_listener, guint num_tables, guint num_timestats, const value_string* vs_type,
+WS_DLL_PUBLIC void register_rtd_table(const int proto_id, const char* tap_listener, unsigned num_tables, unsigned num_timestats, const value_string* vs_type,
                                       tap_packet_cb rtd_packet_func, rtd_filter_check_cb filter_check_cb);
 
 /** Get protocol ID from RTD
@@ -90,7 +90,7 @@ WS_DLL_PUBLIC tap_packet_cb get_rtd_packet_func(register_rtd_t* rtd);
  * @param rtd Registered RTD
  * @return The number of registered tables.
  */
-WS_DLL_PUBLIC guint get_rtd_num_tables(register_rtd_t* rtd);
+WS_DLL_PUBLIC unsigned get_rtd_num_tables(register_rtd_t* rtd);
 
 /** Get value_string used for RTD
  *
@@ -121,10 +121,10 @@ WS_DLL_PUBLIC void reset_rtd_table(rtd_stat_table* table);
 /** Interator to walk RTD tables and execute func
  * Used for initialization
  *
- * @param func action to be performed on all converation tables
+ * @param func action to be performed on all conversation tables
  * @param user_data any data needed to help perform function
  */
-WS_DLL_PUBLIC void rtd_table_iterate_tables(wmem_foreach_func func, gpointer user_data);
+WS_DLL_PUBLIC void rtd_table_iterate_tables(wmem_foreach_func func, void *user_data);
 
 /** Return filter used for register_tap_listener
  *
@@ -150,7 +150,7 @@ WS_DLL_PUBLIC void rtd_table_dissector_init(register_rtd_t* rtd, rtd_stat_table*
  * @param rtd Registered RTD
  * @return RTD tap string
  */
-WS_DLL_PUBLIC gchar* rtd_table_get_tap_string(register_rtd_t* rtd);
+WS_DLL_PUBLIC char* rtd_table_get_tap_string(register_rtd_t* rtd);
 
 #ifdef __cplusplus
 }