[Glibc-bsd-commits] r4767 - in trunk/glibc-ports/kfreebsd: . fbtl

[Petr Salinger]

Author: ps-guest
Date: 2013-07-19 13:36:28 +0000 (Fri, 19 Jul 2013)
New Revision: 4767

Modified:
   trunk/glibc-ports/kfreebsd/fbtl/clock_getcpuclockid.c
   trunk/glibc-ports/kfreebsd/fbtl/pthread_getcpuclockid.c
   trunk/glibc-ports/kfreebsd/fbtl/sysconf.c
   trunk/glibc-ports/kfreebsd/syscalls-inline.h
Log:
move __syscall_clock_getcpuclockid2() prototype into one place, it might change soon


Modified: trunk/glibc-ports/kfreebsd/fbtl/clock_getcpuclockid.c
===================================================================
--- trunk/glibc-ports/kfreebsd/fbtl/clock_getcpuclockid.c	2013-07-19 12:34:33 UTC (rev 4766)
+++ trunk/glibc-ports/kfreebsd/fbtl/clock_getcpuclockid.c	2013-07-19 13:36:28 UTC (rev 4767)
@@ -20,10 +20,6 @@
 #include <unistd.h>
 #include <kernel-features.h>
 
-int __syscall_clock_getcpuclockid2(long id, int which, clockid_t *clock_id);
-libc_hidden_proto (__syscall_clock_getcpuclockid2)
-
-
 int
 __clock_getcpuclockid (pid_t pid, clockid_t *clock_id)
 {

Modified: trunk/glibc-ports/kfreebsd/fbtl/pthread_getcpuclockid.c
===================================================================
--- trunk/glibc-ports/kfreebsd/fbtl/pthread_getcpuclockid.c	2013-07-19 12:34:33 UTC (rev 4766)
+++ trunk/glibc-ports/kfreebsd/fbtl/pthread_getcpuclockid.c	2013-07-19 13:36:28 UTC (rev 4767)
@@ -22,9 +22,6 @@
 #include <pthreadP.h>
 #include <tls.h>
 
-int __syscall_clock_getcpuclockid2(long id, int which, clockid_t *clock_id);
-libc_hidden_proto (__syscall_clock_getcpuclockid2)
-
 int
 pthread_getcpuclockid (threadid, clockid)
      pthread_t threadid;

Modified: trunk/glibc-ports/kfreebsd/fbtl/sysconf.c
===================================================================
--- trunk/glibc-ports/kfreebsd/fbtl/sysconf.c	2013-07-19 12:34:33 UTC (rev 4766)
+++ trunk/glibc-ports/kfreebsd/fbtl/sysconf.c	2013-07-19 13:36:28 UTC (rev 4767)
@@ -28,9 +28,6 @@
 
 static long int posix_sysconf (int name);
 
-int __syscall_clock_getcpuclockid2(long id, int which, clockid_t *clock_id);
-libc_hidden_proto (__syscall_clock_getcpuclockid2)
-
 /* Get the value of the system variable NAME.  */
 long int
 __sysconf (int name)

Modified: trunk/glibc-ports/kfreebsd/syscalls-inline.h
===================================================================
--- trunk/glibc-ports/kfreebsd/syscalls-inline.h	2013-07-19 12:34:33 UTC (rev 4766)
+++ trunk/glibc-ports/kfreebsd/syscalls-inline.h	2013-07-19 13:36:28 UTC (rev 4767)
@@ -62,6 +62,15 @@
 libc_hidden_proto (__syscall_sigwait)
 libc_hidden_proto (__syscall_sigwaitinfo)
 libc_hidden_proto (__syscall_sigtimedwait)
+
+#if 0
+// interface might not be final
+// see http://www.freebsd.org/cgi/query-pr.cgi?pr=180652
+int __syscall_clock_getcpuclockid2(int64_t id, int which, clockid_t *clock_id);
+#else
+int __syscall_clock_getcpuclockid2(long id, int which, clockid_t *clock_id);
+#endif
+libc_hidden_proto (__syscall_clock_getcpuclockid2)
                            
 int __syscall_thr_exit(long *p);
 int __syscall_thr_kill(long id, int sig);