Replace __[SU]SYSCALL_LONG_TYPE with __syscall_[su]long_t

2012-03-16  H.J. Lu  <hongjiu.lu@intel.com>

	* bits/types.h (__syscall_slong_t): New type.
	(__syscall_ulong_t): Likewise.
	* sysdeps/unix/sysv/linux/x86_64/bits/ipc.h: Replace
	__USYSCALL_LONG_TYPE/__USYSCALL_LONG_TYPE with
	__syscall_slong_t/__syscall_ulong_t.
	* sysdeps/unix/sysv/linux/x86_64/bits/mqueue.h: Likewise.
	* sysdeps/unix/sysv/linux/x86_64/bits/mqueue.h: Likewise.
	* sysdeps/unix/sysv/linux/x86_64/bits/msq.: Likewise.
	* sysdeps/unix/sysv/linux/x86_64/bits/sem.h: Likewise.
	* sysdeps/unix/sysv/linux/x86_64/bits/shm.h: Likewise.
	* sysdeps/unix/sysv/linux/x86_64/bits/stat.h: Likewise.
	* sysdeps/unix/sysv/linux/x86_64/bits/statfs.h: Likewise.
	* sysdeps/unix/sysv/linux/x86_64/bits/timex.h: Likewise.
	* sysdeps/unix/sysv/linux/x86_64/sys/msg.h: Likewise.

	* bits/typesizes.h (__SYSCALL_SLONG_TYPE): New macro.
	(__SYSCALL_ULONG_TYPE): Likewise.
	* sysdeps/unix/bsd/bsd4.4/freebsd/bits/typesizes.h
	(__SYSCALL_SLONG_TYPE): Likewise.
	(__SYSCALL_ULONG_TYPE): Likewise.
	* sysdeps/unix/sysv/linux/s390/bits/typesizes.h
	(__SYSCALL_SLONG_TYPE): Likewise.
	(__SYSCALL_ULONG_TYPE): Likewise.
	* sysdeps/unix/sysv/linux/sparc/bits/typesizes.h
	(__SYSCALL_SLONG_TYPE): Likewise.
	(__SYSCALL_ULONG_TYPE): Likewise.

	* sysdeps/unix/sysv/linux/x86_64/bits/typesizes.h
	(__SSYSCALL_LONG_TYPE): Renamed to ...
	(__SYSCALL_SLONG_TYPE): This.
	(__SSYSCALL_LONG_TYPE): Renamed to ...
	(__SYSCALL_ULONG_TYPE): This.

16 files changed, 120 insertions, 72 deletions

diff --git a/ChangeLog.x32 b/ChangeLog.x32
index 9e65db2a51..81013be7de 100644
--- a/ChangeLog.x32
+++ b/ChangeLog.x32
@@ -1,5 +1,40 @@
 2012-03-16  H.J. Lu  <hongjiu.lu@intel.com>
 
+	* bits/types.h (__syscall_slong_t): New type.
+	(__syscall_ulong_t): Likewise.
+	* sysdeps/unix/sysv/linux/x86_64/bits/ipc.h: Replace
+	__USYSCALL_LONG_TYPE/__USYSCALL_LONG_TYPE with
+	__syscall_slong_t/__syscall_ulong_t.
+	* sysdeps/unix/sysv/linux/x86_64/bits/mqueue.h: Likewise.
+	* sysdeps/unix/sysv/linux/x86_64/bits/mqueue.h: Likewise.
+	* sysdeps/unix/sysv/linux/x86_64/bits/msq.: Likewise.
+	* sysdeps/unix/sysv/linux/x86_64/bits/sem.h: Likewise.
+	* sysdeps/unix/sysv/linux/x86_64/bits/shm.h: Likewise.
+	* sysdeps/unix/sysv/linux/x86_64/bits/stat.h: Likewise.
+	* sysdeps/unix/sysv/linux/x86_64/bits/statfs.h: Likewise.
+	* sysdeps/unix/sysv/linux/x86_64/bits/timex.h: Likewise.
+	* sysdeps/unix/sysv/linux/x86_64/sys/msg.h: Likewise.
+
+	* bits/typesizes.h (__SYSCALL_SLONG_TYPE): New macro.
+	(__SYSCALL_ULONG_TYPE): Likewise.
+	* sysdeps/unix/bsd/bsd4.4/freebsd/bits/typesizes.h
+	(__SYSCALL_SLONG_TYPE): Likewise.
+	(__SYSCALL_ULONG_TYPE): Likewise.
+	* sysdeps/unix/sysv/linux/s390/bits/typesizes.h
+	(__SYSCALL_SLONG_TYPE): Likewise.
+	(__SYSCALL_ULONG_TYPE): Likewise.
+	* sysdeps/unix/sysv/linux/sparc/bits/typesizes.h
+	(__SYSCALL_SLONG_TYPE): Likewise.
+	(__SYSCALL_ULONG_TYPE): Likewise.
+
+	* sysdeps/unix/sysv/linux/x86_64/bits/typesizes.h
+	(__SSYSCALL_LONG_TYPE): Renamed to ...
+	(__SYSCALL_SLONG_TYPE): This.
+	(__SSYSCALL_LONG_TYPE): Renamed to ...
+	(__SYSCALL_ULONG_TYPE): This.
+
+2012-03-16  H.J. Lu  <hongjiu.lu@intel.com>
+
 	* sysdeps/unix/sysv/linux/i386/readelflib.c (process_elf_file):
 	Move e_machine check before EI_CLASS check.  Check EM_IA_64 only
 	if SKIP_EM_IA_64 isn't defined.
diff --git a/bits/types.h b/bits/types.h
index d6915d76b0..542a61e780 100644
--- a/bits/types.h
+++ b/bits/types.h
@@ -180,6 +180,11 @@ __STD_TYPE __FSFILCNT64_T_TYPE __fsfilcnt64_t;
 
 __STD_TYPE __SSIZE_T_TYPE __ssize_t; /* Type of a byte count, or error.  */
 
+/* Signed long type used in system calls.  */
+__STD_TYPE __SYSCALL_SLONG_TYPE __syscall_slong_t;
+/* Unsigned long type used in system calls.  */
+__STD_TYPE __SYSCALL_ULONG_TYPE __syscall_ulong_t;
+
 /* These few don't really vary by system, they always correspond
    to one of the other defined types.  */
 typedef __off64_t __loff_t;	/* Type of file sizes and offsets (LFS).  */
diff --git a/bits/typesizes.h b/bits/typesizes.h
index 63ef936fb4..17ff79794e 100644
--- a/bits/typesizes.h
+++ b/bits/typesizes.h
@@ -60,6 +60,8 @@
 #define __FSID_T_TYPE		struct { int __val[2]; }
 #define __SSIZE_T_TYPE		__SWORD_TYPE
 #define __SNSECONDS_T_TYPE	__SLONGWORD_TYPE
+#define __SYSCALL_SLONG_TYPE	__SLONGWORD_TYPE
+#define __SYSCALL_ULONG_TYPE	__ULONGWORD_TYPE
 
 /* Number of descriptors that can fit in an `fd_set'.  */
 #define	__FD_SETSIZE		1024
diff --git a/sysdeps/unix/bsd/bsd4.4/freebsd/bits/typesizes.h b/sysdeps/unix/bsd/bsd4.4/freebsd/bits/typesizes.h
index 26ea5a6cdc..430ca75354 100644
--- a/sysdeps/unix/bsd/bsd4.4/freebsd/bits/typesizes.h
+++ b/sysdeps/unix/bsd/bsd4.4/freebsd/bits/typesizes.h
@@ -59,6 +59,8 @@
 #define __FSID_T_TYPE		struct { int __val[2]; }
 #define __SSIZE_T_TYPE		__SWORD_TYPE
 #define __SNSECONDS_T_TYPE	__SLONGWORD_TYPE
+#define __SYSCALL_SLONG_TYPE	__SLONGWORD_TYPE
+#define __SYSCALL_ULONG_TYPE	__ULONGWORD_TYPE
 
 /* Number of descriptors that can fit in an `fd_set'.  */
 #define	__FD_SETSIZE		1024
diff --git a/sysdeps/unix/sysv/linux/s390/bits/typesizes.h b/sysdeps/unix/sysv/linux/s390/bits/typesizes.h
index b97f42a270..c016b7dbb0 100644
--- a/sysdeps/unix/sysv/linux/s390/bits/typesizes.h
+++ b/sysdeps/unix/sysv/linux/s390/bits/typesizes.h
@@ -65,6 +65,8 @@
 #define __SSIZE_T_TYPE		__SLONGWORD_TYPE
 #endif
 #define __SNSECONDS_T_TYPE	__SLONGWORD_TYPE
+#define __SYSCALL_SLONG_TYPE	__SLONGWORD_TYPE
+#define __SYSCALL_ULONG_TYPE	__ULONGWORD_TYPE
 
 /* Number of descriptors that can fit in an `fd_set'.  */
 #define	__FD_SETSIZE		1024
diff --git a/sysdeps/unix/sysv/linux/sparc/bits/typesizes.h b/sysdeps/unix/sysv/linux/sparc/bits/typesizes.h
index 3f062c02af..50f4a8beea 100644
--- a/sysdeps/unix/sysv/linux/sparc/bits/typesizes.h
+++ b/sysdeps/unix/sysv/linux/sparc/bits/typesizes.h
@@ -59,6 +59,8 @@
 #define __FSID_T_TYPE		struct { int __val[2]; }
 #define __SSIZE_T_TYPE		__SWORD_TYPE
 #define __SNSECONDS_T_TYPE	__SLONGWORD_TYPE
+#define __SYSCALL_SLONG_TYPE	__SLONGWORD_TYPE
+#define __SYSCALL_ULONG_TYPE	__ULONGWORD_TYPE
 
 /* Number of descriptors that can fit in an `fd_set'.  */
 #define	__FD_SETSIZE		1024
diff --git a/sysdeps/unix/sysv/linux/x86_64/bits/ipc.h b/sysdeps/unix/sysv/linux/x86_64/bits/ipc.h
index de6aec14eb..0736d43aeb 100644
--- a/sysdeps/unix/sysv/linux/x86_64/bits/ipc.h
+++ b/sysdeps/unix/sysv/linux/x86_64/bits/ipc.h
@@ -52,6 +52,6 @@ struct ipc_perm
     unsigned short int __pad1;
     unsigned short int __seq;		/* Sequence number.  */
     unsigned short int __pad2;
-    __USYSCALL_LONG_TYPE __unused1;
-    __USYSCALL_LONG_TYPE __unused2;
+    __syscall_ulong_t __unused1;
+    __syscall_ulong_t __unused2;
   };
diff --git a/sysdeps/unix/sysv/linux/x86_64/bits/mqueue.h b/sysdeps/unix/sysv/linux/x86_64/bits/mqueue.h
index 096c8df9df..1448a7a7d2 100644
--- a/sysdeps/unix/sysv/linux/x86_64/bits/mqueue.h
+++ b/sysdeps/unix/sysv/linux/x86_64/bits/mqueue.h
@@ -27,9 +27,9 @@ typedef int mqd_t;
 
 struct mq_attr
 {
-  __SSYSCALL_LONG_TYPE mq_flags;		/* Message queue flags.  */
-  __SSYSCALL_LONG_TYPE mq_maxmsg;	/* Maximum number of messages.  */
-  __SSYSCALL_LONG_TYPE mq_msgsize;	/* Maximum message size.  */
-  __SSYSCALL_LONG_TYPE mq_curmsgs;	/* Number of messages currently queued.  */
-  __SSYSCALL_LONG_TYPE __pad[4];
+  __syscall_slong_t mq_flags;	/* Message queue flags.  */
+  __syscall_slong_t mq_maxmsg;	/* Maximum number of messages.  */
+  __syscall_slong_t mq_msgsize;	/* Maximum message size.  */
+  __syscall_slong_t mq_curmsgs;	/* Number of messages currently queued.  */
+  __syscall_slong_t __pad[4];
 };
diff --git a/sysdeps/unix/sysv/linux/x86_64/bits/msq.h b/sysdeps/unix/sysv/linux/x86_64/bits/msq.h
index 6007e74e87..f6a99e546d 100644
--- a/sysdeps/unix/sysv/linux/x86_64/bits/msq.h
+++ b/sysdeps/unix/sysv/linux/x86_64/bits/msq.h
@@ -30,8 +30,8 @@
 #endif
 
 /* Types used in the structure definition.  */
-typedef __USYSCALL_LONG_TYPE msgqnum_t;
-typedef __USYSCALL_LONG_TYPE msglen_t;
+typedef __syscall_ulong_t msgqnum_t;
+typedef __syscall_ulong_t msglen_t;
 
 /* Structure of record for one message inside the kernel.
    The type `struct msg' is opaque.  */
@@ -50,13 +50,13 @@ struct msqid_ds
 #ifndef __x86_64__
   unsigned long int __unused3;
 #endif
-  __USYSCALL_LONG_TYPE __msg_cbytes; /* current number of bytes on queue */
+  __syscall_ulong_t __msg_cbytes; /* current number of bytes on queue */
   msgqnum_t msg_qnum;		/* number of messages currently on queue */
   msglen_t msg_qbytes;		/* max number of bytes allowed on queue */
   __pid_t msg_lspid;		/* pid of last msgsnd() */
   __pid_t msg_lrpid;		/* pid of last msgrcv() */
-  __USYSCALL_LONG_TYPE __unused4;
-  __USYSCALL_LONG_TYPE __unused5;
+  __syscall_ulong_t __unused4;
+  __syscall_ulong_t __unused5;
 };
 
 #ifdef __USE_MISC
diff --git a/sysdeps/unix/sysv/linux/x86_64/bits/sem.h b/sysdeps/unix/sysv/linux/x86_64/bits/sem.h
index e1d0827ed4..41696413b4 100644
--- a/sysdeps/unix/sysv/linux/x86_64/bits/sem.h
+++ b/sysdeps/unix/sysv/linux/x86_64/bits/sem.h
@@ -40,12 +40,12 @@ struct semid_ds
 {
   struct ipc_perm sem_perm;		/* operation permission struct */
   __time_t sem_otime;			/* last semop() time */
-  __USYSCALL_LONG_TYPE __unused1;
+  __syscall_ulong_t __unused1;
   __time_t sem_ctime;			/* last time changed by semctl() */
-  __USYSCALL_LONG_TYPE __unused2;
-  __USYSCALL_LONG_TYPE sem_nsems;	/* number of semaphores in set */
-  __USYSCALL_LONG_TYPE __unused3;
-  __USYSCALL_LONG_TYPE __unused4;
+  __syscall_ulong_t __unused2;
+  __syscall_ulong_t sem_nsems;		/* number of semaphores in set */
+  __syscall_ulong_t __unused3;
+  __syscall_ulong_t __unused4;
 };
 
 /* The user should define a union like the following to use it for arguments
diff --git a/sysdeps/unix/sysv/linux/x86_64/bits/shm.h b/sysdeps/unix/sysv/linux/x86_64/bits/shm.h
index 1184caac90..ee51deb36e 100644
--- a/sysdeps/unix/sysv/linux/x86_64/bits/shm.h
+++ b/sysdeps/unix/sysv/linux/x86_64/bits/shm.h
@@ -45,7 +45,7 @@ extern int __getpagesize (void) __THROW __attribute__ ((__const__));
 
 
 /* Type to count number of attaches.  */
-typedef __USYSCALL_LONG_TYPE shmatt_t;
+typedef __syscall_ulong_t shmatt_t;
 
 /* Data structure describing a shared memory segment.  */
 struct shmid_ds
@@ -67,8 +67,8 @@ struct shmid_ds
     __pid_t shm_cpid;			/* pid of creator */
     __pid_t shm_lpid;			/* pid of last shmop */
     shmatt_t shm_nattch;		/* number of current attaches */
-    __USYSCALL_LONG_TYPE __unused4;
-    __USYSCALL_LONG_TYPE __unused5;
+    __syscall_ulong_t __unused4;
+    __syscall_ulong_t __unused5;
   };
 
 #ifdef __USE_MISC
@@ -85,25 +85,25 @@ struct shmid_ds
 
 struct	shminfo
   {
-    __USYSCALL_LONG_TYPE shmmax;
-    __USYSCALL_LONG_TYPE shmmin;
-    __USYSCALL_LONG_TYPE shmmni;
-    __USYSCALL_LONG_TYPE shmseg;
-    __USYSCALL_LONG_TYPE shmall;
-    __USYSCALL_LONG_TYPE __unused1;
-    __USYSCALL_LONG_TYPE __unused2;
-    __USYSCALL_LONG_TYPE __unused3;
-    __USYSCALL_LONG_TYPE __unused4;
+    __syscall_ulong_t shmmax;
+    __syscall_ulong_t shmmin;
+    __syscall_ulong_t shmmni;
+    __syscall_ulong_t shmseg;
+    __syscall_ulong_t shmall;
+    __syscall_ulong_t __unused1;
+    __syscall_ulong_t __unused2;
+    __syscall_ulong_t __unused3;
+    __syscall_ulong_t __unused4;
   };
 
 struct shm_info
   {
     int used_ids;
-    __USYSCALL_LONG_TYPE shm_tot;	/* total allocated shm */
-    __USYSCALL_LONG_TYPE shm_rss;	/* total resident shm */
-    __USYSCALL_LONG_TYPE shm_swp;	/* total swapped shm */
-    __USYSCALL_LONG_TYPE swap_attempts;
-    __USYSCALL_LONG_TYPE swap_successes;
+    __syscall_ulong_t shm_tot;	/* total allocated shm */
+    __syscall_ulong_t shm_rss;	/* total resident shm */
+    __syscall_ulong_t shm_swp;	/* total swapped shm */
+    __syscall_ulong_t swap_attempts;
+    __syscall_ulong_t swap_successes;
   };
 
 #endif /* __USE_MISC */
diff --git a/sysdeps/unix/sysv/linux/x86_64/bits/stat.h b/sysdeps/unix/sysv/linux/x86_64/bits/stat.h
index 16d2d4389b..0647a17234 100644
--- a/sysdeps/unix/sysv/linux/x86_64/bits/stat.h
+++ b/sysdeps/unix/sysv/linux/x86_64/bits/stat.h
@@ -96,11 +96,11 @@ struct stat
 # define st_ctime st_ctim.tv_sec
 #else
     __time_t st_atime;			/* Time of last access.  */
-    __USYSCALL_LONG_TYPE st_atimensec;	/* Nscecs of last access.  */
+    __syscall_ulong_t st_atimensec;	/* Nscecs of last access.  */
     __time_t st_mtime;			/* Time of last modification.  */
-    __USYSCALL_LONG_TYPE st_mtimensec;	/* Nsecs of last modification.  */
+    __syscall_ulong_t st_mtimensec;	/* Nsecs of last modification.  */
     __time_t st_ctime;			/* Time of last status change.  */
-    __USYSCALL_LONG_TYPE st_ctimensec;	/* Nsecs of last status change.  */
+    __syscall_ulong_t st_ctimensec;	/* Nsecs of last status change.  */
 #endif
 #ifdef __x86_64__
     long long int __unused[3];
@@ -157,11 +157,11 @@ struct stat64
 #  define st_ctime st_ctim.tv_sec
 # else
     __time_t st_atime;			/* Time of last access.  */
-    __USYSCALL_LONG_TYPE st_atimensec;	/* Nscecs of last access.  */
+    __syscall_ulong_t st_atimensec;	/* Nscecs of last access.  */
     __time_t st_mtime;			/* Time of last modification.  */
-    __USYSCALL_LONG_TYPE st_mtimensec;	/* Nsecs of last modification.  */
+    __syscall_ulong_t st_mtimensec;	/* Nsecs of last modification.  */
     __time_t st_ctime;			/* Time of last status change.  */
-    __USYSCALL_LONG_TYPE st_ctimensec;	/* Nsecs of last status change.  */
+    __syscall_ulong_t st_ctimensec;	/* Nsecs of last status change.  */
 # endif
 # ifdef __x86_64__
     long long int __unused[3];
diff --git a/sysdeps/unix/sysv/linux/x86_64/bits/statfs.h b/sysdeps/unix/sysv/linux/x86_64/bits/statfs.h
index 96977e1dda..d96337ecbb 100644
--- a/sysdeps/unix/sysv/linux/x86_64/bits/statfs.h
+++ b/sysdeps/unix/sysv/linux/x86_64/bits/statfs.h
@@ -25,8 +25,8 @@
 
 struct statfs
   {
-    __SSYSCALL_LONG_TYPE f_type;
-    __SSYSCALL_LONG_TYPE f_bsize;
+    __syscall_slong_t f_type;
+    __syscall_slong_t f_bsize;
 #ifndef __USE_FILE_OFFSET64
     __fsblkcnt_t f_blocks;
     __fsblkcnt_t f_bfree;
@@ -41,27 +41,27 @@ struct statfs
     __fsfilcnt64_t f_ffree;
 #endif
     __fsid_t f_fsid;
-    __SSYSCALL_LONG_TYPE f_namelen;
-    __SSYSCALL_LONG_TYPE f_frsize;
-    __SSYSCALL_LONG_TYPE f_flags;
-    __SSYSCALL_LONG_TYPE f_spare[4];
+    __syscall_slong_t f_namelen;
+    __syscall_slong_t f_frsize;
+    __syscall_slong_t f_flags;
+    __syscall_slong_t f_spare[4];
   };
 
 #ifdef __USE_LARGEFILE64
 struct statfs64
   {
-    __SSYSCALL_LONG_TYPE f_type;
-    __SSYSCALL_LONG_TYPE f_bsize;
+    __syscall_slong_t f_type;
+    __syscall_slong_t f_bsize;
     __fsblkcnt64_t f_blocks;
     __fsblkcnt64_t f_bfree;
     __fsblkcnt64_t f_bavail;
     __fsfilcnt64_t f_files;
     __fsfilcnt64_t f_ffree;
     __fsid_t f_fsid;
-    __SSYSCALL_LONG_TYPE f_namelen;
-    __SSYSCALL_LONG_TYPE f_frsize;
-    __SSYSCALL_LONG_TYPE f_flags;
-    __SSYSCALL_LONG_TYPE f_spare[4];
+    __syscall_slong_t f_namelen;
+    __syscall_slong_t f_frsize;
+    __syscall_slong_t f_flags;
+    __syscall_slong_t f_spare[4];
   };
 #endif
 
diff --git a/sysdeps/unix/sysv/linux/x86_64/bits/timex.h b/sysdeps/unix/sysv/linux/x86_64/bits/timex.h
index 1c7d90d398..adf6292292 100644
--- a/sysdeps/unix/sysv/linux/x86_64/bits/timex.h
+++ b/sysdeps/unix/sysv/linux/x86_64/bits/timex.h
@@ -27,41 +27,41 @@ struct timex
   /* mode selector */
   unsigned int modes;
   /* time offset (usec) */
-  __SSYSCALL_LONG_TYPE offset;
+  __syscall_slong_t offset;
   /* frequency offset (scaled ppm) */
-  __SSYSCALL_LONG_TYPE freq;
+  __syscall_slong_t freq;
   /* maximum error (usec) */
-  __SSYSCALL_LONG_TYPE maxerror;
+  __syscall_slong_t maxerror;
   /* estimated error (usec) */
-  __SSYSCALL_LONG_TYPE esterror;
+  __syscall_slong_t esterror;
   /* clock command/status */
   int status;
   /* pll time constant */
-  __SSYSCALL_LONG_TYPE constant;
+  __syscall_slong_t constant;
   /* clock precision (usec) (read only) */
-  __SSYSCALL_LONG_TYPE precision;
+  __syscall_slong_t precision;
   /* clock frequency tolerance (ppm) (read only) */
-  __SSYSCALL_LONG_TYPE tolerance;
+  __syscall_slong_t tolerance;
   /* (read only) */
   struct timeval time;
   /* (modified) usecs between clock ticks */
-  __SSYSCALL_LONG_TYPE tick;
+  __syscall_slong_t tick;
   /* pps frequency (scaled ppm) (ro) */
-  __SSYSCALL_LONG_TYPE ppsfreq;
+  __syscall_slong_t ppsfreq;
   /* pps jitter (us) (ro) */
-  __SSYSCALL_LONG_TYPE jitter;
+  __syscall_slong_t jitter;
   /* interval duration (s) (shift) (ro) */
   int shift;
   /* pps stability (scaled ppm) (ro) */
-  __SSYSCALL_LONG_TYPE stabil;
+  __syscall_slong_t stabil;
   /* jitter limit exceeded (ro) */
-  __SSYSCALL_LONG_TYPE jitcnt;
+  __syscall_slong_t jitcnt;
   /* calibration intervals (ro) */
-  __SSYSCALL_LONG_TYPE calcnt;
+  __syscall_slong_t calcnt;
   /* calibration errors (ro) */
-  __SSYSCALL_LONG_TYPE errcnt;
+  __syscall_slong_t errcnt;
   /* stability limit exceeded (ro) */
-  __SSYSCALL_LONG_TYPE stbcnt;
+  __syscall_slong_t stbcnt;
 
   /* TAI offset (ro) */
   int tai;
diff --git a/sysdeps/unix/sysv/linux/x86_64/bits/typesizes.h b/sysdeps/unix/sysv/linux/x86_64/bits/typesizes.h
index 2f416670b6..d6d4b927a1 100644
--- a/sysdeps/unix/sysv/linux/x86_64/bits/typesizes.h
+++ b/sysdeps/unix/sysv/linux/x86_64/bits/typesizes.h
@@ -41,8 +41,8 @@
 #define __SUSECONDS_T_TYPE	__SQUAD_TYPE
 #define __SNSECONDS_T_TYPE	__SQUAD_TYPE
 #define __BLKSIZE_T_TYPE	__SQUAD_TYPE
-#define __SSYSCALL_LONG_TYPE	__SQUAD_TYPE
-#define __USYSCALL_LONG_TYPE	__UQUAD_TYPE
+#define __SYSCALL_SLONG_TYPE	__SQUAD_TYPE
+#define __SYSCALL_ULONG_TYPE	__UQUAD_TYPE
 #else
 #define __INO_T_TYPE		__ULONGWORD_TYPE
 #define __NLINK_T_TYPE		__UWORD_TYPE
@@ -56,8 +56,8 @@
 #define __SUSECONDS_T_TYPE	__SLONGWORD_TYPE
 #define __SNSECONDS_T_TYPE	__SLONGWORD_TYPE
 #define __BLKSIZE_T_TYPE	__SLONGWORD_TYPE
-#define __SSYSCALL_LONG_TYPE	__SLONGWORD_TYPE
-#define __USYSCALL_LONG_TYPE	__ULONGWORD_TYPE
+#define __SYSCALL_SLONG_TYPE	__SLONGWORD_TYPE
+#define __SYSCALL_ULONG_TYPE	__ULONGWORD_TYPE
 #endif
 
 #define __DEV_T_TYPE		__UQUAD_TYPE
diff --git a/sysdeps/unix/sysv/linux/x86_64/sys/msg.h b/sysdeps/unix/sysv/linux/x86_64/sys/msg.h
index 4a6271dafa..35aa171a91 100644
--- a/sysdeps/unix/sysv/linux/x86_64/sys/msg.h
+++ b/sysdeps/unix/sysv/linux/x86_64/sys/msg.h
@@ -52,7 +52,7 @@ typedef __ssize_t ssize_t;
 /* Template for struct to be used as argument for `msgsnd' and `msgrcv'.  */
 struct msgbuf
   {
-    __SSYSCALL_LONG_TYPE mtype;	/* type of received/sent message */
+    __syscall_slong_t mtype;	/* type of received/sent message */
     char mtext[1];		/* text of the message */
   };
 #endif