about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog10
-rw-r--r--nss/makedb.c4
2 files changed, 11 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index e52cd67f47..04f67f0dd9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,8 +1,12 @@
+2012-05-10  Thomas Schwinge  <thomas@schwinge.name>
+
+	* nss/makedb.c (MAP_POPULATE): If not defined, define to zero.
+
 2012-05-10  Samuel Thibault  <samuel.thibault@ens-lyon.org>
 
-        Fix mlock in all cases except non-readable pages.
-        * sysdeps/mach/hurd/mlock.c (mlock): Give VM_PROT_READ
-        instead of VM_PROT_ALL as parameter to __vm_wire function.
+	Fix mlock in all cases except non-readable pages.
+	* sysdeps/mach/hurd/mlock.c (mlock): Give VM_PROT_READ
+	instead of VM_PROT_ALL as parameter to __vm_wire function.
 
 	* sysdeps/mach/hurd/mkdir.c: Include <string.h>.
 	(__mkdir): When path is `/', just fail with EEXIST.
diff --git a/nss/makedb.c b/nss/makedb.c
index 5c073a7440..5890c054f0 100644
--- a/nss/makedb.c
+++ b/nss/makedb.c
@@ -48,6 +48,10 @@
 # include <selinux/selinux.h>
 #endif
 
+#ifndef MAP_POPULATE
+# define MAP_POPULATE 0
+#endif
+
 #define PACKAGE _libc_intl_domainname
 
 /* List of data bases.  */