r1655 - in glibc-package/branches/glibc-2.4/debian: . patches patches/kfreebsd
Author: aurel32
Date: 2006-06-13 17:27:54 +0000 (Tue, 13 Jun 2006)
New Revision: 1655
Added:
glibc-package/branches/glibc-2.4/debian/patches/kfreebsd/local-memusage_no_mremap.diff
Modified:
glibc-package/branches/glibc-2.4/debian/changelog
glibc-package/branches/glibc-2.4/debian/patches/series.kfreebsd-amd64
glibc-package/branches/glibc-2.4/debian/patches/series.kfreebsd-i386
Log:
* Add kfreebsd/local-memusage_no_mremap.diff.
Modified: glibc-package/branches/glibc-2.4/debian/changelog
===================================================================
--- glibc-package/branches/glibc-2.4/debian/changelog 2006-06-13 17:18:56 UTC (rev 1654)
+++ glibc-package/branches/glibc-2.4/debian/changelog 2006-06-13 17:27:54 UTC (rev 1655)
@@ -103,6 +103,7 @@
* Update kfreebsd/local-scripts.diff.
* Add kfreebsd/local-ftw.diff.
* Add kfreebsd/local-sysdeps-2.4.diff.
+ * Add kfreebsd/local-memusage_no_mremap.diff.
* Remove m32r/cvs-elf-m32r_rel32.diff (merged upstream).
* Update m68k/local-compat.diff.
* Update m68k/local-mathinline_h.diff to reflect the new port add-on.
Added: glibc-package/branches/glibc-2.4/debian/patches/kfreebsd/local-memusage_no_mremap.diff
===================================================================
--- glibc-package/branches/glibc-2.4/debian/patches/kfreebsd/local-memusage_no_mremap.diff 2006-06-13 17:18:56 UTC (rev 1654)
+++ glibc-package/branches/glibc-2.4/debian/patches/kfreebsd/local-memusage_no_mremap.diff 2006-06-13 17:27:54 UTC (rev 1655)
@@ -0,0 +1,19 @@
+--- malloc/memusage.c~ 2006-06-12 15:45:13.000000000 +0200
++++ malloc/memusage.c 2006-06-12 15:45:13.000000000 +0200
+@@ -650,6 +650,8 @@
+ return result;
+ }
+
++#include <_G_config.h>
++#ifdef _G_HAVE_MREMAP
+
+ /* `mmap' replacement. We do not have to keep track of the sizesince
+ `munmap' will get it as a parameter. */
+@@ -715,6 +717,7 @@
+ /* Return the pointer to the user buffer. */
+ return result;
+ }
++#endif
+
+
+ /* `munmap' replacement. */
Modified: glibc-package/branches/glibc-2.4/debian/patches/series.kfreebsd-amd64
===================================================================
--- glibc-package/branches/glibc-2.4/debian/patches/series.kfreebsd-amd64 2006-06-13 17:18:56 UTC (rev 1654)
+++ glibc-package/branches/glibc-2.4/debian/patches/series.kfreebsd-amd64 2006-06-13 17:27:54 UTC (rev 1655)
@@ -1,4 +1,5 @@
kfreebsd/local-ftw.diff -p0
+kfreebsd/local-memusage_no_mremap.diff -p0
kfreebsd/local-pthread_at_fork.diff -p0
kfreebsd/local-readdir_r.diff -p0
kfreebsd/local-scripts.diff -p0
Modified: glibc-package/branches/glibc-2.4/debian/patches/series.kfreebsd-i386
===================================================================
--- glibc-package/branches/glibc-2.4/debian/patches/series.kfreebsd-i386 2006-06-13 17:18:56 UTC (rev 1654)
+++ glibc-package/branches/glibc-2.4/debian/patches/series.kfreebsd-i386 2006-06-13 17:27:54 UTC (rev 1655)
@@ -1,4 +1,5 @@
kfreebsd/local-ftw.diff -p0
+kfreebsd/local-memusage_no_mremap.diff -p0
kfreebsd/local-pthread_at_fork.diff -p0
kfreebsd/local-readdir_r.diff -p0
kfreebsd/local-scripts.diff -p0
Reply to: