Adding upstream version 4.4.0.upstream/4.4.0upstream

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

1 files changed, 5 insertions, 5 deletions

diff --git a/ui/time_shift.h b/ui/time_shift.h
index 89dd6619..e2dfb84a 100644
--- a/ui/time_shift.h
+++ b/ui/time_shift.h
@@ -42,7 +42,7 @@ extern "C" {
  * @return NULL on success or an error description on failure.
  */
 
-const gchar * time_string_parse(const gchar *time_text, int *year, int *month, int *day, gboolean *negative, int *hour, int *minute, long double *second);
+const char * time_string_parse(const char *time_text, int *year, int *month, int *day, bool *negative, int *hour, int *minute, long double *second);
 
 /** Shift all packets by an offset
  *
@@ -51,7 +51,7 @@ const gchar * time_string_parse(const gchar *time_text, int *year, int *month, i
  *
  * @return NULL on success or an error description on failure.
  */
-const gchar * time_shift_all(capture_file *cf, const gchar *offset_text);
+const char * time_shift_all(capture_file *cf, const char *offset_text);
 
 /* Set the time for a single packet
  *
@@ -61,7 +61,7 @@ const gchar * time_shift_all(capture_file *cf, const gchar *offset_text);
  *
  * @return NULL on success or an error description on failure.
  */
-const gchar * time_shift_settime(capture_file *cf, guint packet_num, const gchar *time_text);
+const char * time_shift_settime(capture_file *cf, unsigned packet_num, const char *time_text);
 
 /* Set the time for two packets and extrapolate the rest
  *
@@ -73,7 +73,7 @@ const gchar * time_shift_settime(capture_file *cf, guint packet_num, const gchar
  *
  * @return NULL on success or an error description on failure.
  */
-const gchar * time_shift_adjtime(capture_file *cf, guint packet1_num, const gchar *time1_text, guint packet2_num, const gchar *time2_text);
+const char * time_shift_adjtime(capture_file *cf, unsigned packet1_num, const char *time1_text, unsigned packet2_num, const char *time2_text);
 
 /* Reset the times for all packets
  *
@@ -81,7 +81,7 @@ const gchar * time_shift_adjtime(capture_file *cf, guint packet1_num, const gcha
  *
  * @return NULL on success or an error description on failure.
  */
-const gchar * time_shift_undo(capture_file *cf);
+const char * time_shift_undo(capture_file *cf);
 
 #ifdef __cplusplus
 }