[uClibc-cvs] svn commit: trunk/uClibc/libc/misc/sysvipc

vapier at uclibc.org vapier at uclibc.org
Wed Jun 29 22:17:49 UTC 2005


Author: vapier
Date: 2005-06-29 16:17:49 -0600 (Wed, 29 Jun 2005)
New Revision: 10626

Log:
previous commit of trimming __IPC_64 wasnt quite correct ... rework __IPC_64 so that it will compile and it is correct

Modified:
   trunk/uClibc/libc/misc/sysvipc/msgq.c
   trunk/uClibc/libc/misc/sysvipc/shm.c


Changeset:
Modified: trunk/uClibc/libc/misc/sysvipc/msgq.c
===================================================================
--- trunk/uClibc/libc/misc/sysvipc/msgq.c	2005-06-29 22:09:29 UTC (rev 10625)
+++ trunk/uClibc/libc/misc/sysvipc/msgq.c	2005-06-29 22:17:49 UTC (rev 10626)
@@ -6,15 +6,19 @@
 #ifdef L_msgctl
 
 #ifdef __NR_msgctl
-_syscall3(int, msgctl, int, msqid, int, cmd, struct msqid_ds *, buf);
-#else
+#define __NR___libc_msgctl __NR_msgctl
+_syscall3(int, __libc_msgctl, int, msqid, int, cmd, struct msqid_ds *, buf);
+#endif
 /* Message queue control operation.  */
-int msgctl (int msqid, int cmd, struct msqid_ds *buf)
+int msgctl(int msqid, int cmd, struct msqid_ds *buf)
 {
-    return __syscall_ipc(IPCOP_msgctl ,msqid ,cmd | __IPC_64 ,0 ,buf);
+#ifdef __NR_msgctl
+	return __libc_msgctl(msqid, cmd | __IPC_64, buf);
+#else
+    return __syscall_ipc(IPCOP_msgctl, msqid, cmd | __IPC_64, 0, buf);
+#endif
 }
 #endif
-#endif
 
 
 #ifdef L_msgget

Modified: trunk/uClibc/libc/misc/sysvipc/shm.c
===================================================================
--- trunk/uClibc/libc/misc/sysvipc/shm.c	2005-06-29 22:09:29 UTC (rev 10625)
+++ trunk/uClibc/libc/misc/sysvipc/shm.c	2005-06-29 22:17:49 UTC (rev 10626)
@@ -48,14 +48,18 @@
 #ifdef L_shmctl
 /* Provide operations to control over shared memory segments.  */
 #ifdef __NR_shmctl
-_syscall3(int, shmctl, int, shmid, int, cmd, struct shmid_ds *, buf);
+#define __NR___libc_shmctl __NR_shmctl
+_syscall3(int, __libc_shmctl, int, shmid, int, cmd, struct shmid_ds *, buf);
+#endif
+int shmctl(int shmid, int cmd, struct shmid_ds *buf)
+{
+#ifdef __NR_shmctl
+	return __libc_shmctl(shmid, cmd | __IPC_64, buf);
 #else
-int shmctl (int shmid, int cmd, struct shmid_ds *buf)
-{
-    return __syscall_ipc(IPCOP_shmctl, shmid, cmd | __IPC_64 , 0, buf);
+    return __syscall_ipc(IPCOP_shmctl, shmid, cmd | __IPC_64, 0, buf);
+#endif
 }
 #endif
-#endif
 
 
 #ifdef L_shmdt




More information about the uClibc-cvs mailing list