entered into RCS

diff --git a/posix/gnu/types.h b/posix/gnu/types.h
index 16d5c27..30f753f 100644 (file)
--- a/posix/gnu/types.h
+++ b/posix/gnu/types.h
@@ -26,15 +26,20 @@ typedef unsigned char __u_char;
 typedef unsigned short __u_short;
 typedef unsigned int __u_int;
 typedef unsigned long __u_long;
 typedef unsigned short __u_short;
 typedef unsigned int __u_int;
 typedef unsigned long __u_long;

+#ifdef __GNUC__
+typedef unsigned long long int __u_quad_t;
+typedef long long int __quad_t;
+typedef __quad_t *__qaddr_t;
+#else

 typedef struct
 {
   long val[2];
 typedef struct
 {
   long val[2];

-} __quad;
+} __quad_t;

 typedef struct
 {
   __u_long val[2];
 typedef struct
 {
   __u_long val[2];

-} __u_quad;
-
+} __u_quad_t;
+#endif

 typedef int __dev_t;           /* Type of device numbers.  */
 typedef unsigned int __uid_t;  /* Type of user identifications.  */
 typedef unsigned int __gid_t;  /* Type of group identifications.  */
 typedef int __dev_t;           /* Type of device numbers.  */
 typedef unsigned int __uid_t;  /* Type of user identifications.  */
 typedef unsigned int __gid_t;  /* Type of group identifications.  */


@@ -44,11 +49,7 @@ typedef unsigned short int __nlink_t; /* Type of file link counts.  */
 typedef long int __off_t;      /* Type of file sizes and offsets.  */
 typedef int __pid_t;           /* Type of process identifications.  */
 typedef int __ssize_t;         /* Type of a byte count, or error.  */
 typedef long int __off_t;      /* Type of file sizes and offsets.  */
 typedef int __pid_t;           /* Type of process identifications.  */
 typedef int __ssize_t;         /* Type of a byte count, or error.  */

-#ifdef __GNUC__
-typedef unsigned long long int __fsid_t; /* Type of file system IDs.  */
-#else
-typedef __quad __fsid_t;       /* Type of file system IDs.  */
-#endif
+typedef __u_quad_t __fsid_t;   /* Type of file system IDs.  */

 
 /* Everythin' else.  */
 typedef long int __daddr_t;    /* The type of a disk address.  */
 
 /* Everythin' else.  */
 typedef long int __daddr_t;    /* The type of a disk address.  */

diff --git a/posix/sys/types.h b/posix/sys/types.h
index 17e5cbd..b261649 100644 (file)
--- a/posix/sys/types.h
+++ b/posix/sys/types.h
@@ -34,8 +34,8 @@ __BEGIN_DECLS
 #define u_short __u_short
 #define u_int __u_int
 #define u_long __u_long
 #define u_short __u_short
 #define u_int __u_int
 #define u_long __u_long

-#define quad __quad
-#define u_quad __u_quad
+#define quad_t __quad_t
+#define u_quad_t __u_quad_t

 #define        fsid_t __fsid_t
 #endif
 
 #define        fsid_t __fsid_t
 #endif