Use <sys/mman.h> instead of <linux/mman.h> to fix a compile problem

on SLES 10.  Patch by Rich Coe (rcoe@wi.rr.com). Fixes bugzilla #282238.

git-svn-id: svn://svn.valgrind.org/valgrind/trunk@12072

diff --git a/NEWS b/NEWS
index a13b290f6c5b3cccaceaaaf3c24cdbd722403e20..9579eead0fc417d4d6296e8142a9cb6d74a767f9 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -279,6 +279,8 @@ fixed
 
 274378 - s390x: Various dispatcher tweaks
 
+282238 - SLES10: make check fails
+
 
 Release 3.6.1 (16 February 2011)
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

diff --git a/memcheck/tests/x86-linux/scalar.h b/memcheck/tests/x86-linux/scalar.h
index 2d103703c7a6cd9a9096cd60a8dec664e62062ea..ef28b035508cf5c3d358b239e3f78b5dee582ea5 100644 (file)
--- a/memcheck/tests/x86-linux/scalar.h
+++ b/memcheck/tests/x86-linux/scalar.h
@@ -9,7 +9,7 @@
 #include <sys/stat.h>
 #include <sys/ptrace.h>
 #include <sys/types.h>
-#include <linux/mman.h>
+#include <sys/mman.h>
 
 // Since we use vki_unistd.h, we can't include <unistd.h>.  So we have to
 // declare this ourselves.