diff options
| -rw-r--r-- | login-utils/checktty.c | 11 | ||||
| -rw-r--r-- | shlibs/blkid/src/topology/evms.c | 8 |
2 files changed, 10 insertions, 9 deletions
diff --git a/login-utils/checktty.c b/login-utils/checktty.c index 0d1ec0ef..264cc603 100644 --- a/login-utils/checktty.c +++ b/login-utils/checktty.c @@ -15,6 +15,7 @@ #include <string.h> #include <stdio.h> #include <stdlib.h> +#include <stdint.h> #include <unistd.h> #include <time.h> #include <sys/stat.h> @@ -235,15 +236,15 @@ hnmatch_ip6(const char *pat) /* compare */ while (mask_len > 0) { if (mask_len < 32) { - u_int32_t mask = htonl(~(0xffffffff >> mask_len)); + uint32_t mask = htonl(~(0xffffffff >> mask_len)); - if ((*(u_int32_t *)&addr.s6_addr[i] & mask) != - (*(u_int32_t *)&net.sin6_addr.s6_addr[i] & mask)) + if ((*(uint32_t *)&addr.s6_addr[i] & mask) != + (*(uint32_t *)&net.sin6_addr.s6_addr[i] & mask)) goto mismatch; break; } - if (*(u_int32_t *)&addr.s6_addr[i] != - *(u_int32_t *)&net.sin6_addr.s6_addr[i]) + if (*(uint32_t *)&addr.s6_addr[i] != + *(uint32_t *)&net.sin6_addr.s6_addr[i]) goto mismatch; i += 4; mask_len -= 32; diff --git a/shlibs/blkid/src/topology/evms.c b/shlibs/blkid/src/topology/evms.c index 574d9f55..a30d8df7 100644 --- a/shlibs/blkid/src/topology/evms.c +++ b/shlibs/blkid/src/topology/evms.c @@ -25,14 +25,14 @@ #define EVMS_MAJOR 117 #ifndef _IOT__IOTBASE_u_int32_t -#define _IOT__IOTBASE_u_int32_t IOT_SIMPLE(u_int32_t) +#define _IOT__IOTBASE_u_int32_t IOT_SIMPLE(uint32_t) #endif -#define _IOT_evms_stripe_info _IOT (_IOTS(u_int32_t), 2, 0, 0, 0, 0) +#define _IOT_evms_stripe_info _IOT (_IOTS(uint32_t), 2, 0, 0, 0, 0) #define EVMS_GET_STRIPE_INFO _IOR(EVMS_MAJOR, 0xF0, struct evms_stripe_info) struct evms_stripe_info { - u_int32_t size; /* stripe unit 512-byte blocks */ - u_int32_t width; /* the number of stripe members or RAID data disks */ + uint32_t size; /* stripe unit 512-byte blocks */ + uint32_t width; /* the number of stripe members or RAID data disks */ } evms_stripe_info; static int is_evms_device(dev_t devno) |