Merging upstream version 4.4.0.

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

1 files changed, 7 insertions, 7 deletions

diff --git a/epan/dissectors/packet-ros.h b/epan/dissectors/packet-ros.h
index 104dc6dd..a1d9ea24 100644
--- a/epan/dissectors/packet-ros.h
+++ b/epan/dissectors/packet-ros.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-ros.h                                                               */
-/* asn2wrs.py -b -L -p ros -c ./ros.cnf -s ./packet-ros-template -D . -O ../.. ros.asn Remote-Operations-Information-Objects.asn */
+/* asn2wrs.py -b -q -L -p ros -c ./ros.cnf -s ./packet-ros-template -D . -O ../.. ros.asn Remote-Operations-Information-Objects.asn */
 
 /* packet-ros.h
  * Routines for ROS packet dissection
@@ -49,28 +49,28 @@ int dissect_ros_Code(bool implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, a
 # define err_ros_bind  (-2) /* pseudo error code for asn2wrs generated binds */
 
 typedef struct _ros_opr_t {
-  gint32 opcode;
+  int32_t opcode;
   dissector_t arg_pdu;
   dissector_t res_pdu;
 } ros_opr_t;
 
 typedef struct _ros_err_t {
-  gint32 errcode;
+  int32_t errcode;
   dissector_t err_pdu;
 } ros_err_t;
 
 typedef struct _ros_info_t {
-  const gchar         *name;
+  const char          *name;
   int                 *proto;
-  gint                *ett_proto;
+  int                 *ett_proto;
   const value_string  *opr_code_strings;
   const ros_opr_t     *opr_code_dissectors;
   const value_string  *err_code_strings;
   const ros_err_t     *err_code_dissectors;
 } ros_info_t;
 
-void register_ros_oid_dissector_handle(const char *oid, dissector_handle_t dissector, int proto _U_, const char *name, gboolean uses_rtse);
-void register_ros_protocol_info(const char *oid, const ros_info_t *rinfo, int proto _U_, const char *name, gboolean uses_rtse);
+void register_ros_oid_dissector_handle(const char *oid, dissector_handle_t dissector, int proto _U_, const char *name, bool uses_rtse);
+void register_ros_protocol_info(const char *oid, const ros_info_t *rinfo, int proto _U_, const char *name, bool uses_rtse);
 int call_ros_oid_callback(const char *oid, tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, struct SESSION_DATA_STRUCTURE* session);
 
 #endif  /* PACKET_ROS_H */