[Acl-devel] [PATCH] Use stdint types consistently

[Felix Janda]

---
 include/attributes.h | 6 ++++--
 man/man3/attr_list.3 | 8 ++++----
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/include/attributes.h b/include/attributes.h
index c5809eb..8b73c5c 100644
--- a/include/attributes.h
+++ b/include/attributes.h
@@ -22,6 +22,8 @@
 extern "C" {
 #endif
 
+#include <stdint.h>
+
 #ifndef ENOATTR
 # define ENOATTR ENODATA
 #endif
@@ -73,7 +75,7 @@ typedef struct attrlist {
  * al_offset[i] entry points to.
  */
 typedef struct attrlist_ent {  /* data from attr_list() */
-       u_int32_t       a_valuelen;     /* number bytes in value of attr */
+       uint32_t        a_valuelen;     /* number bytes in value of attr */
        char            a_name[1];      /* attr name (NULL terminated) */
 } attrlist_ent_t;
 
@@ -94,7 +96,7 @@ typedef struct attrlist_ent { /* data from attr_list() */
  * operation on a cursor is to bzero() it.
  */
 typedef struct attrlist_cursor {
-       u_int32_t       opaque[4];      /* an opaque cookie */
+       uint32_t        opaque[4];      /* an opaque cookie */
 } attrlist_cursor_t;
 
 /*
diff --git a/man/man3/attr_list.3 b/man/man3/attr_list.3
index 978cfff..be192d8 100644
--- a/man/man3/attr_list.3
+++ b/man/man3/attr_list.3
@@ -72,9 +72,9 @@ The contents of an \f4attrlist_t\fP structure include the 
following members:
 .nf
 .ft 4
 .ta 9n 22n
-__int32_t al_count; /\(** number of entries in attrlist \(**/
-__int32_t al_more; /\(** T/F: more attrs (do syscall again) \(**/
-__int32_t al_offset[1]; /\(** byte offsets of attrs [var-sized] \(**/
+int32_t al_count; /\(** number of entries in attrlist \(**/
+int32_t al_more; /\(** T/F: more attrs (do syscall again) \(**/
+int32_t al_offset[1]; /\(** byte offsets of attrs [var-sized] \(**/
 .ft 1
 .fi
 .RE
@@ -113,7 +113,7 @@ include the following members:
 .nf
 .ft 4
 .ta 9n 22n
-u_int32_t a_valuelen; /\(** number bytes in value of attr \(**/
+uint32_t a_valuelen; /\(** number bytes in value of attr \(**/
 char a_name[]; /\(** attr name (NULL terminated) \(**/
 .ft 1
 .fi
-- 
2.4.10