From cccc13221da78957aa6dc813a325c13f1a930874 Mon Sep 17 00:00:00 2001
From: Rich Felker <dalias@aerifal.cx>
Date: Sat, 22 Sep 2012 08:04:17 -0400
Subject: fix IPC_64 in msgctl too

---
 arch/x86_64/bits/ipc.h | 2 ++
 src/ipc/msgctl.c       | 4 ++--
 src/ipc/semctl.c       | 4 ----
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/arch/x86_64/bits/ipc.h b/arch/x86_64/bits/ipc.h
index 51ad4427..ac5d0979 100644
--- a/arch/x86_64/bits/ipc.h
+++ b/arch/x86_64/bits/ipc.h
@@ -10,3 +10,5 @@ struct ipc_perm
 	long __pad1;
 	long __pad2;
 };
+
+#define IPC_64 0
diff --git a/src/ipc/msgctl.c b/src/ipc/msgctl.c
index d1ff7c70..4372c719 100644
--- a/src/ipc/msgctl.c
+++ b/src/ipc/msgctl.c
@@ -5,8 +5,8 @@
 int msgctl(int q, int cmd, struct msqid_ds *buf)
 {
 #ifdef SYS_msgctl
-	return syscall(SYS_msgctl, q, cmd | 0x100, buf);
+	return syscall(SYS_msgctl, q, cmd | IPC_64, buf);
 #else
-	return syscall(SYS_ipc, IPCOP_msgctl, q, cmd | 0x100, 0, buf, 0);
+	return syscall(SYS_ipc, IPCOP_msgctl, q, cmd | IPC_64, 0, buf, 0);
 #endif
 }
diff --git a/src/ipc/semctl.c b/src/ipc/semctl.c
index 9de5b1d7..274e2cf3 100644
--- a/src/ipc/semctl.c
+++ b/src/ipc/semctl.c
@@ -3,10 +3,6 @@
 #include "syscall.h"
 #include "ipc.h"
 
-#ifndef IPC_64
-#define IPC_64 0
-#endif
-
 int semctl(int id, int num, int cmd, ...)
 {
 	long arg;
-- 
cgit v1.2.1