Merging upstream version 4.4.0.

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

1 files changed, 19 insertions, 19 deletions

diff --git a/epan/print_stream.h b/epan/print_stream.h
index 3fafa556..98f59ddb 100644
--- a/epan/print_stream.h
+++ b/epan/print_stream.h
@@ -29,15 +29,15 @@ extern "C" {
 struct print_stream;
 
 typedef struct print_stream_ops {
-	gboolean (*print_preamble)(struct print_stream *self, gchar *filename, const char *version_string);
-	gboolean (*print_line)(struct print_stream *self, int indent,
+	bool (*print_preamble)(struct print_stream *self, char *filename, const char *version_string);
+	bool (*print_line)(struct print_stream *self, int indent,
 	    const char *line);
-	gboolean (*print_line_color)(struct print_stream *self, int indent, const char *line, const color_t *fg, const color_t *bg);
-	gboolean (*print_bookmark)(struct print_stream *self,
-	    const gchar *name, const gchar *title);
-	gboolean (*new_page)(struct print_stream *self);
-	gboolean (*print_finale)(struct print_stream *self);
-	gboolean (*destroy)(struct print_stream *self);
+	bool (*print_line_color)(struct print_stream *self, int indent, const char *line, const color_t *fg, const color_t *bg);
+	bool (*print_bookmark)(struct print_stream *self,
+	    const char *name, const char *title);
+	bool (*new_page)(struct print_stream *self);
+	bool (*print_finale)(struct print_stream *self);
+	bool (*destroy)(struct print_stream *self);
 } print_stream_ops_t;
 
 typedef struct print_stream {
@@ -48,28 +48,28 @@ typedef struct print_stream {
 /*
  * These return a print_stream_t * on success and NULL on failure.
  */
-WS_DLL_PUBLIC print_stream_t *print_stream_text_new(gboolean to_file, const char *dest);
+WS_DLL_PUBLIC print_stream_t *print_stream_text_new(bool to_file, const char *dest);
 WS_DLL_PUBLIC print_stream_t *print_stream_text_stdio_new(FILE *fh);
-WS_DLL_PUBLIC print_stream_t *print_stream_ps_new(gboolean to_file, const char *dest);
+WS_DLL_PUBLIC print_stream_t *print_stream_ps_new(bool to_file, const char *dest);
 WS_DLL_PUBLIC print_stream_t *print_stream_ps_stdio_new(FILE *fh);
 
 /*
- * These return TRUE if the print was successful, FALSE otherwise.
+ * These return true if the print was successful, false otherwise.
  */
-WS_DLL_PUBLIC gboolean print_preamble(print_stream_t *self, gchar *filename, const char *version_string);
-WS_DLL_PUBLIC gboolean print_line(print_stream_t *self, int indent, const char *line);
+WS_DLL_PUBLIC bool print_preamble(print_stream_t *self, char *filename, const char *version_string);
+WS_DLL_PUBLIC bool print_line(print_stream_t *self, int indent, const char *line);
 
 /*
  * equivalent to print_line(), but if the stream supports text coloring then
  * the output text will also be colored with the given foreground and
  * background
  */
-WS_DLL_PUBLIC gboolean print_line_color(print_stream_t *self, int indent, const char *line, const color_t *fg, const color_t *bg);
-WS_DLL_PUBLIC gboolean print_bookmark(print_stream_t *self, const gchar *name,
-    const gchar *title);
-WS_DLL_PUBLIC gboolean new_page(print_stream_t *self);
-WS_DLL_PUBLIC gboolean print_finale(print_stream_t *self);
-WS_DLL_PUBLIC gboolean destroy_print_stream(print_stream_t *self);
+WS_DLL_PUBLIC bool print_line_color(print_stream_t *self, int indent, const char *line, const color_t *fg, const color_t *bg);
+WS_DLL_PUBLIC bool print_bookmark(print_stream_t *self, const char *name,
+    const char *title);
+WS_DLL_PUBLIC bool new_page(print_stream_t *self);
+WS_DLL_PUBLIC bool print_finale(print_stream_t *self);
+WS_DLL_PUBLIC bool destroy_print_stream(print_stream_t *self);
 
 #ifdef __cplusplus
 }