|
 |
147e83 |
Fix -Wundef warnings related to __ASSUME_IPC64. This was addressed
|
|
|
147e83 |
differently upstream:
|
|
|
147e83 |
|
|
|
147e83 |
be481652f272acc117907ac30157cdac46aa1973
|
|
|
147e83 |
Author: Andreas Schwab <schwab@suse.de>
|
|
|
147e83 |
Date: Tue Aug 18 10:29:30 2015 +0200
|
|
|
147e83 |
|
|
|
147e83 |
Remove __ASSUME_IPC64
|
|
|
147e83 |
|
|
|
147e83 |
diff --git a/sysdeps/unix/sysv/linux/msgctl.c b/sysdeps/unix/sysv/linux/msgctl.c
|
|
|
147e83 |
index 09d4dc11f779a63f..25f47ce6fdeb19c9 100644
|
|
|
147e83 |
--- a/sysdeps/unix/sysv/linux/msgctl.c
|
|
|
147e83 |
+++ b/sysdeps/unix/sysv/linux/msgctl.c
|
|
|
147e83 |
@@ -65,7 +65,7 @@ compat_symbol (libc, __old_msgctl, msgctl, GLIBC_2_0);
|
|
|
147e83 |
int
|
|
|
147e83 |
__new_msgctl (int msqid, int cmd, struct msqid_ds *buf)
|
|
|
147e83 |
{
|
|
|
147e83 |
-#if __ASSUME_IPC64 > 0
|
|
|
147e83 |
+#ifdef __ASSUME_IPC64
|
|
|
147e83 |
return INLINE_SYSCALL (ipc, 5, IPCOP_msgctl,
|
|
|
147e83 |
msqid, cmd | __IPC_64, 0, buf);
|
|
|
147e83 |
#else
|
|
|
147e83 |
diff --git a/sysdeps/unix/sysv/linux/semctl.c b/sysdeps/unix/sysv/linux/semctl.c
|
|
|
147e83 |
index 3a2f1b39cea657e5..f932fb70525a6876 100644
|
|
|
147e83 |
--- a/sysdeps/unix/sysv/linux/semctl.c
|
|
|
147e83 |
+++ b/sysdeps/unix/sysv/linux/semctl.c
|
|
|
147e83 |
@@ -122,7 +122,7 @@ __new_semctl (int semid, int semnum, int cmd, ...)
|
|
|
147e83 |
|
|
|
147e83 |
va_end (ap);
|
|
|
147e83 |
|
|
|
147e83 |
-#if __ASSUME_IPC64 > 0
|
|
|
147e83 |
+#ifdef __ASSUME_IPC64
|
|
|
147e83 |
return INLINE_SYSCALL (ipc, 5, IPCOP_semctl, semid, semnum, cmd | __IPC_64,
|
|
|
147e83 |
&arg;;
|
|
|
147e83 |
#else
|
|
|
147e83 |
diff --git a/sysdeps/unix/sysv/linux/shmctl.c b/sysdeps/unix/sysv/linux/shmctl.c
|
|
|
147e83 |
index f99ee77f92878b1b..378fda21ea699c73 100644
|
|
|
147e83 |
--- a/sysdeps/unix/sysv/linux/shmctl.c
|
|
|
147e83 |
+++ b/sysdeps/unix/sysv/linux/shmctl.c
|
|
|
147e83 |
@@ -72,7 +72,7 @@ compat_symbol (libc, __old_shmctl, shmctl, GLIBC_2_0);
|
|
|
147e83 |
int
|
|
|
147e83 |
__new_shmctl (int shmid, int cmd, struct shmid_ds *buf)
|
|
|
147e83 |
{
|
|
|
147e83 |
-#if __ASSUME_IPC64 > 0
|
|
|
147e83 |
+#ifdef __ASSUME_IPC64
|
|
|
147e83 |
return INLINE_SYSCALL (ipc, 5, IPCOP_shmctl, shmid, cmd | __IPC_64, 0,
|
|
|
147e83 |
buf);
|
|
|
147e83 |
#else
|