Include <sys/types.h> instead of <stddef.h> since ssize_t is needed as well. Replace const with __const.

1 files changed, 14 insertions, 16 deletions

diff --git a/misc/sys/xattr.h b/misc/sys/xattr.h
index 0e98185940..2737f90bde 100644
--- a/misc/sys/xattr.h
+++ b/misc/sys/xattr.h
@@ -20,11 +20,9 @@
 #define _SYS_XATTR_H	1
 
 #include <features.h>
+#include <sys/types.h>
 
 
-#define __need_size_t
-#include <stddef.h>
-
 __BEGIN_DECLS
 
 /* The following constants should be used for the fifth parameter of
@@ -39,48 +37,48 @@ enum
 
 /* Set the attribute NAME of the file pointed to by PATH to VALUE (which
    is SIZE bytes long).  Return 0 on success, -1 for errors.  */
-extern int setxattr (const char *__path, const char *__name,
-		     const void *__value, size_t __size, int __flags)
+extern int setxattr (__const char *__path, __const char *__name,
+		     __const void *__value, size_t __size, int __flags)
 	__THROW;
 
 /* Set the attribute NAME of the file pointed to by PATH to VALUE (which is
    SIZE bytes long), not following symlinks for the last pathname component.
    Return 0 on success, -1 for errors.  */
-extern int lsetxattr (const char *__path, const char *__name,
-		      const void *__value, size_t __size, int __flags)
+extern int lsetxattr (__const char *__path, __const char *__name,
+		      __const void *__value, size_t __size, int __flags)
 	__THROW;
 
 /* Set the attribute NAME of the file descriptor FD to VALUE (which is SIZE
    bytes long).  Return 0 on success, -1 for errors.  */
-extern int fsetxattr (int __fd, const char *__name, const void *__value,
+extern int fsetxattr (int __fd, __const char *__name, __const void *__value,
 		      size_t __size, int __flags) __THROW;
 
 /* Get the attribute NAME of the file pointed to by PATH to VALUE (which is
    SIZE bytes long).  Return 0 on success, -1 for errors.  */
-extern ssize_t getxattr (const char *__path, const char *__name,
+extern ssize_t getxattr (__const char *__path, __const char *__name,
 			 void *__value, size_t __size) __THROW;
 
 /* Get the attribute NAME of the file pointed to by PATH to VALUE (which is
    SIZE bytes long), not following symlinks for the last pathname component.
    Return 0 on success, -1 for errors.  */
-extern ssize_t lgetxattr (const char *__path, const char *__name,
+extern ssize_t lgetxattr (__const char *__path, __const char *__name,
 			  void *__value, size_t __size) __THROW;
 
 /* Get the attribute NAME of the file descriptor FD to VALUE (which is SIZE
    bytes long).  Return 0 on success, -1 for errors.  */
-extern ssize_t fgetxattr (int __fd, const char *__name, void *__value,
+extern ssize_t fgetxattr (int __fd, __const char *__name, void *__value,
 			  size_t __size) __THROW;
 
 /* List attributes of the file pointed to by PATH into the user-supplied
    buffer LIST (which is SIZE bytes big).  Return 0 on success, -1 for
    errors.  */
-extern ssize_t listxattr (const char *__path, char *__list, size_t __size)
+extern ssize_t listxattr (__const char *__path, char *__list, size_t __size)
 	__THROW;
 
 /* List attributes of the file pointed to by PATH into the user-supplied
    buffer LIST (which is SIZE bytes big), not following symlinks for the
    last pathname component.  Return 0 on success, -1 for errors.  */
-extern ssize_t llistxattr (const char *__path, char *__list, size_t __size)
+extern ssize_t llistxattr (__const char *__path, char *__list, size_t __size)
 	__THROW;
 
 /* List attributes of the file descriptor FD into the user-supplied buffer
@@ -90,16 +88,16 @@ extern ssize_t flistxattr (int __fd, char *__list, size_t __size)
 
 /* Remove the attribute NAME from the file pointed to by PATH.  Return 0
    on success, -1 for errors.  */
-extern int removexattr (const char *__path, const char *__name) __THROW;
+extern int removexattr (__const char *__path, __const char *__name) __THROW;
 
 /* Remove the attribute NAME from the file pointed to by PATH, not
    following symlinks for the last pathname component.  Return 0 on
    success, -1 for errors.  */
-extern int lremovexattr (const char *__path, const char *__name) __THROW;
+extern int lremovexattr (__const char *__path, __const char *__name) __THROW;
 
 /* Remove the attribute NAME from the file descriptor FD.  Return 0 on
    success, -1 for errors.  */
-extern int fremovexattr (int __fd, const char *__name) __THROW;
+extern int fremovexattr (int __fd, __const char *__name) __THROW;
 
 __END_DECLS