r4367 - in glibc-package/trunk/debian: . patches/kfreebsd
Author: aurel32
Date: 2010-07-30 20:18:55 +0000 (Fri, 30 Jul 2010)
New Revision: 4367
Modified:
glibc-package/trunk/debian/changelog
glibc-package/trunk/debian/patches/kfreebsd/local-sysdeps.diff
Log:
* kfreebsd/local-sysdeps.diff: update to revision 3129 (from glibc-bsd).
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2010-07-27 03:15:09 UTC (rev 4366)
+++ glibc-package/trunk/debian/changelog 2010-07-30 20:18:55 UTC (rev 4367)
@@ -4,7 +4,7 @@
* testsuite-checking/expected-results-i486-gnu-libc: update.
[ Petr Salinger ]
- * kfreebsd/local-sysdeps.diff: update to revision 3063 (from glibc-bsd).
+ * kfreebsd/local-sysdeps.diff: update to revision 3129 (from glibc-bsd).
[ Clint Adams ]
* Reflect EGLIBC in binary package short descriptions. closes: #587586.
@@ -15,7 +15,7 @@
* Look for apache2.2-common instead of apache2-common in nsscheck.
Closes: #586527.
- -- Aurelien Jarno <aurel32@debian.org> Tue, 27 Jul 2010 05:11:49 +0200
+ -- Aurelien Jarno <aurel32@debian.org> Fri, 30 Jul 2010 22:18:39 +0200
eglibc (2.11.2-2) unstable; urgency=medium
Modified: glibc-package/trunk/debian/patches/kfreebsd/local-sysdeps.diff
===================================================================
--- glibc-package/trunk/debian/patches/kfreebsd/local-sysdeps.diff 2010-07-27 03:15:09 UTC (rev 4366)
+++ glibc-package/trunk/debian/patches/kfreebsd/local-sysdeps.diff 2010-07-30 20:18:55 UTC (rev 4367)
@@ -11214,7 +11214,7 @@
+/* 'getrlimit64' is the same as 'getrlimit', because __rlim64_t == __rlim_t. */
--- /dev/null
+++ b/ports/sysdeps/unix/bsd/bsd4.4/kfreebsd/getsysstats.c
-@@ -0,0 +1,108 @@
+@@ -0,0 +1,109 @@
+/* Copyright (C) 2002 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
+ Contributed by Bruno Haible <bruno@clisp.org>, 2002.
@@ -11235,6 +11235,7 @@
+ 02111-1307 USA. */
+
+#include <sys/sysctl.h>
++#include <unistd.h>
+#include <stddef.h>
+
+
@@ -11243,14 +11244,14 @@
+{
+ /* Fetch sysctl value of "hw.ncpu". */
+ int request[2] = { CTL_HW, HW_NCPU };
-+ int result;
++ long int result;
+ size_t result_len = sizeof (result);
+
+ if (__sysctl (request, 2, &result, &result_len, NULL, 0) < 0)
+ /* Dummy result. */
+ return 1;
+
-+ return result;
++ return result / __getpagesize();
+}
+
+weak_alias (__get_nprocs, get_nprocs)
Reply to: