include Use <stdint.h> types from xtables.h

Signed-off-by: Felix Janda <felix.janda@posteo.de>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>

diff --git a/include/xtables.h b/include/xtables.h
index bad11a8944fb2b4940c74c2fc8fab50ff8f6331a..978ae0d150f5dd431dd0f739472a87c83c2f22d0 100644 (file)
--- a/include/xtables.h
+++ b/include/xtables.h
@@ -220,12 +220,12 @@ struct xtables_match
        const char *real_name;
 
        /* Revision of match (0 by default). */
-       u_int8_t revision;
+       uint8_t revision;
 
        /* Extension flags */
-       u_int8_t ext_flags;
+       uint8_t ext_flags;
 
-       u_int16_t family;
+       uint16_t family;
 
        /* Size of match data. */
        size_t size;
@@ -297,12 +297,12 @@ struct xtables_target
        const char *real_name;
 
        /* Revision of target (0 by default). */
-       u_int8_t revision;
+       uint8_t revision;
 
        /* Extension flags */
-       u_int8_t ext_flags;
+       uint8_t ext_flags;
 
-       u_int16_t family;
+       uint16_t family;
 
 
        /* Size of target data. */
@@ -373,7 +373,7 @@ struct xtables_rule_match {
  */
 struct xtables_pprot {
        const char *name;
-       u_int8_t num;
+       uint8_t num;
 };
 
 enum xtables_tryload {
@@ -449,12 +449,12 @@ extern bool xtables_strtoul(const char *, char **, uintmax_t *,
 extern bool xtables_strtoui(const char *, char **, unsigned int *,
        unsigned int, unsigned int);
 extern int xtables_service_to_port(const char *name, const char *proto);
-extern u_int16_t xtables_parse_port(const char *port, const char *proto);
+extern uint16_t xtables_parse_port(const char *port, const char *proto);
 extern void
 xtables_parse_interface(const char *arg, char *vianame, unsigned char *mask);
 
 /* this is a special 64bit data type that is 8-byte aligned */
-#define aligned_u64 u_int64_t __attribute__((aligned(8)))
+#define aligned_u64 uint64_t __attribute__((aligned(8)))
 
 extern struct xtables_globals *xt_params;
 #define xtables_error (xt_params->exit_err)
@@ -517,7 +517,7 @@ extern void xtables_print_num(uint64_t number, unsigned int format);
 #endif
 
 extern const struct xtables_pprot xtables_chain_protos[];
-extern u_int16_t xtables_parse_protocol(const char *s);
+extern uint16_t xtables_parse_protocol(const char *s);
 
 /* kernel revision handling */
 extern int kernel_version;