r4368 - in glibc-package/trunk/debian: . patches/kfreebsd
Author: ps-guest
Date: 2010-07-31 07:17:28 +0000 (Sat, 31 Jul 2010)
New Revision: 4368
Modified:
glibc-package/trunk/debian/changelog
glibc-package/trunk/debian/patches/kfreebsd/local-sysdeps.diff
Log:
* kfreebsd/local-sysdeps.diff: update to revision 3131 (from glibc-bsd).
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2010-07-30 20:18:55 UTC (rev 4367)
+++ glibc-package/trunk/debian/changelog 2010-07-31 07:17:28 UTC (rev 4368)
@@ -4,7 +4,7 @@
* testsuite-checking/expected-results-i486-gnu-libc: update.
[ Petr Salinger ]
- * kfreebsd/local-sysdeps.diff: update to revision 3129 (from glibc-bsd).
+ * kfreebsd/local-sysdeps.diff: update to revision 3131 (from glibc-bsd).
[ Clint Adams ]
* Reflect EGLIBC in binary package short descriptions. closes: #587586.
Modified: glibc-package/trunk/debian/patches/kfreebsd/local-sysdeps.diff
===================================================================
--- glibc-package/trunk/debian/patches/kfreebsd/local-sysdeps.diff 2010-07-30 20:18:55 UTC (rev 4367)
+++ glibc-package/trunk/debian/patches/kfreebsd/local-sysdeps.diff 2010-07-31 07:17:28 UTC (rev 4368)
@@ -11244,14 +11244,14 @@
+{
+ /* Fetch sysctl value of "hw.ncpu". */
+ int request[2] = { CTL_HW, HW_NCPU };
-+ long int result;
++ int result;
+ size_t result_len = sizeof (result);
+
+ if (__sysctl (request, 2, &result, &result_len, NULL, 0) < 0)
+ /* Dummy result. */
+ return 1;
+
-+ return result / __getpagesize();
++ return result;
+}
+
+weak_alias (__get_nprocs, get_nprocs)
@@ -11273,13 +11273,13 @@
+ /* Fetch sysctl value of "hw.physmem". This is a little smaller than
+ the real installed memory size, but so what. */
+ int request[2] = { CTL_HW, HW_PHYSMEM };
-+ int result;
++ unsigned long int result;
+ size_t result_len = sizeof (result);
+
+ if (__sysctl (request, 2, &result, &result_len, NULL, 0) < 0)
+ return -1;
+
-+ return result;
++ return result / __getpagesize();
+}
+
+weak_alias (__get_phys_pages, get_phys_pages)
Reply to: