[Glibc-bsd-commits] r3204 - trunk/glibc-ports/kfreebsd

[Robert Millan]

Author: rmh
Date: 2010-12-08 20:44:13 +0000 (Wed, 08 Dec 2010)
New Revision: 3204

Modified:
   trunk/glibc-ports/kfreebsd/brk.c
   trunk/glibc-ports/kfreebsd/semctl.c
Log:
Switch my old __syscall code to INLINE_SYSCALL.

Modified: trunk/glibc-ports/kfreebsd/brk.c
===================================================================
--- trunk/glibc-ports/kfreebsd/brk.c	2010-12-08 20:42:51 UTC (rev 3203)
+++ trunk/glibc-ports/kfreebsd/brk.c	2010-12-08 20:44:13 UTC (rev 3204)
@@ -1,6 +1,6 @@
-/* Copyright (C) 2004 Free Software Foundation, Inc.
+/* Copyright (C) 2004, 2010 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
-   Contributed by Robert Millan <robertmh at gnu.org>
+   Contributed by Robert Millan
 
    The GNU C Library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Lesser General Public
@@ -19,14 +19,8 @@
 
 #include <errno.h>
 #include <unistd.h>
-#include <sys/syscall.h>
+#include <sysdep.h>
 
-#ifndef SYS_break
-#define SYS_break SYS_obreak
-#endif
-
-int __syscall(int number, ...);
-
 extern void _end;
 
 /* sbrk.c expects this.  */
@@ -41,7 +35,7 @@
   if (addr < &_end)
     return 0;
 
-  if (__syscall (SYS_break, addr) == -1)
+  if (INLINE_SYSCALL (obreak, 1, addr) == -1)
     {
       __set_errno (ENOMEM);
       return -1;

Modified: trunk/glibc-ports/kfreebsd/semctl.c
===================================================================
--- trunk/glibc-ports/kfreebsd/semctl.c	2010-12-08 20:42:51 UTC (rev 3203)
+++ trunk/glibc-ports/kfreebsd/semctl.c	2010-12-08 20:44:13 UTC (rev 3204)
@@ -1,6 +1,6 @@
-/* Copyright (C) 2004 Free Software Foundation, Inc.
+/* Copyright (C) 2004, 2010 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
-   Contributed by Robert Millan <robertmh at gnu.org>
+   Contributed by Robert Millan
 
    The GNU C Library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Lesser General Public
@@ -44,8 +44,8 @@
  *
  */
 
+#include <sysdep.h>
 #include <sys/sem.h>
-#include <sys/syscall.h>
 #include <stdarg.h> /* va_list */
 #include <stdlib.h> /* NULL */
 #include <unistd.h>
@@ -61,8 +61,6 @@
   unsigned short *array;	/* array for GETALL & SETALL */
 };
 
-int __syscall(int number, ...);
-
 int
 semctl (int semid, int semnum, int cmd, ...)
 {
@@ -83,5 +81,5 @@
     }
   va_end (ap);
 
-  return __syscall (SYS_semctl, semid, semnum, cmd, semun_ptr);
+  return INLINE_SYSCALL (semctl, 4, semid, semnum, cmd, semun_ptr);
 }