Adding upstream version 4.4.0.upstream/4.4.0upstream

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

1 files changed, 8 insertions, 8 deletions

diff --git a/epan/dissectors/packet-h323.h b/epan/dissectors/packet-h323.h
index a4af1a98..f3b96224 100644
--- a/epan/dissectors/packet-h323.h
+++ b/epan/dissectors/packet-h323.h
@@ -1,7 +1,7 @@
 /* Do not modify this file. Changes will be overwritten.                      */
 /* Generated automatically by the ASN.1 to Wireshark dissector compiler       */
 /* packet-h323.h                                                              */
-/* asn2wrs.py -L -p h323 -c ./h323.cnf -s ./packet-h323-template -D . -O ../.. RAS-PROTOCOL-TUNNEL.asn ROBUSTNESS-DATA.asn */
+/* asn2wrs.py -q -L -p h323 -c ./h323.cnf -s ./packet-h323-template -D . -O ../.. RAS-PROTOCOL-TUNNEL.asn ROBUSTNESS-DATA.asn */
 
 /* packet-h323.h
  * Routines for H.235 packet dissection
@@ -22,7 +22,7 @@
 #define GEF_CTX_SIGNATURE 0x47454658  /* "GEFX" */
 
 typedef struct _gef_ctx_t {
-  guint32 signature;
+  uint32_t signature;
   struct _gef_ctx_t *parent;
   /*
     H323-MESSAGES
@@ -42,14 +42,14 @@ typedef struct _gef_ctx_t {
       EncryptionSync
         <id>
   */
-  const gchar *type;
-  const gchar *id;
-  const gchar *subid;
-  const gchar *key;
+  const char *type;
+  const char *id;
+  const char *subid;
+  const char *key;
 } gef_ctx_t;
 
-extern gef_ctx_t* gef_ctx_alloc(wmem_allocator_t *pool, gef_ctx_t *parent, const gchar *type);
-extern gboolean gef_ctx_check_signature(gef_ctx_t *gefx);
+extern gef_ctx_t* gef_ctx_alloc(wmem_allocator_t *pool, gef_ctx_t *parent, const char *type);
+extern bool gef_ctx_check_signature(gef_ctx_t *gefx);
 extern gef_ctx_t* gef_ctx_get(void *ptr);
 extern void gef_ctx_update_key(wmem_allocator_t *pool, gef_ctx_t *gefx);