1 files changed, 20 insertions, 20 deletions

diff --git a/wiretap/pcapng.h b/wiretap/pcapng.h
index 3e5735d9..74e8019c 100644
--- a/wiretap/pcapng.h
+++ b/wiretap/pcapng.h
@@ -21,57 +21,57 @@
 
 /* pcapng: common block header file encoding for every block type */
 typedef struct pcapng_block_header_s {
-    guint32 block_type;
-    guint32 block_total_length;
+    uint32_t block_type;
+    uint32_t block_total_length;
     /* x bytes block_body */
-    /* guint32 block_total_length */
+    /* uint32_t block_total_length */
 } pcapng_block_header_t;
 
 /* pcapng: section header block file encoding */
 typedef struct pcapng_section_header_block_s {
     /* pcapng_block_header_t */
-    guint32 magic;
-    guint16 version_major;
-    guint16 version_minor;
-    guint64 section_length; /* might be -1 for unknown */
+    uint32_t magic;
+    uint16_t version_major;
+    uint16_t version_minor;
+    uint64_t section_length; /* might be -1 for unknown */
     /* ... Options ... */
 } pcapng_section_header_block_t;
 
 /* pcapng: interface description block file encoding */
 typedef struct pcapng_interface_description_block_s {
-    guint16 linktype;
-    guint16 reserved;
-    guint32 snaplen;
+    uint16_t linktype;
+    uint16_t reserved;
+    uint32_t snaplen;
     /* ... Options ... */
 } pcapng_interface_description_block_t;
 
 /* pcapng: interface statistics block file encoding */
 typedef struct pcapng_interface_statistics_block_s {
-    guint32 interface_id;
-    guint32 timestamp_high;
-    guint32 timestamp_low;
+    uint32_t interface_id;
+    uint32_t timestamp_high;
+    uint32_t timestamp_low;
     /* ... Options ... */
 } pcapng_interface_statistics_block_t;
 
 /* pcapng: Decryption Secrets Block file encoding */
 typedef struct pcapng_decryption_secrets_block_s {
-    guint32 secrets_type;   /* Secrets Type, see secrets-types.h */
-    guint32 secrets_len;    /* Size of variable-length secrets data. */
+    uint32_t secrets_type;   /* Secrets Type, see secrets-types.h */
+    uint32_t secrets_len;    /* Size of variable-length secrets data. */
     /* x bytes Secrets Data. */
     /* ... Options ... */
 } pcapng_decryption_secrets_block_t;
 
 struct pcapng_option_header {
-    guint16 type;
-    guint16 value_length;
+    uint16_t type;
+    uint16_t value_length;
 };
 
 /*
  * Minimum IDB size = minimum block size + size of fixed length portion of IDB.
  */
-#define MIN_IDB_SIZE    ((guint32)(MIN_BLOCK_SIZE + sizeof(pcapng_interface_description_block_t)))
-#define MIN_DSB_SIZE    ((guint32)(MIN_BLOCK_SIZE + sizeof(pcapng_decryption_secrets_block_t)))
+#define MIN_IDB_SIZE    ((uint32_t)(MIN_BLOCK_SIZE + sizeof(pcapng_interface_description_block_t)))
+#define MIN_DSB_SIZE    ((uint32_t)(MIN_BLOCK_SIZE + sizeof(pcapng_decryption_secrets_block_t)))
 
-wtap_open_return_val pcapng_open(wtap *wth, int *err, gchar **err_info);
+wtap_open_return_val pcapng_open(wtap *wth, int *err, char **err_info);
 
 #endif