From: Julian Seward <jseward@acm.org>
Date: Thu, 2 Aug 2012 18:51:51 +0000 (+0000)
Subject: Un-break the build on OSX < 10.8 following r12814
X-Git-Tag: svn/VALGRIND_3_8_0~53
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dc0ca811ecc91d6180656438753d86c9b4a6d2f7;p=thirdparty%2Fvalgrind.git

Un-break the build on OSX < 10.8 following r12814
(which was initial OSX 10.8 support)


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

diff --git a/coregrind/m_syswrap/syswrap-darwin.c b/coregrind/m_syswrap/syswrap-darwin.c
index fb4cb5f764..77e0bb1f92 100644
--- a/coregrind/m_syswrap/syswrap-darwin.c
+++ b/coregrind/m_syswrap/syswrap-darwin.c
@@ -8395,7 +8395,7 @@ const SyscallTableEntry ML_(mach_trap_table)[] = {
 #  if DARWIN_VERS == DARWIN_10_8
    MACXY(VG_DARWIN_SYSCALL_CONSTRUCT_MACH(10), mach__10), 
 #  else
-   _____(VG_DARWIN_SYSCALL_CONSTRUCT_MACH(10), 
+   _____(VG_DARWIN_SYSCALL_CONSTRUCT_MACH(10)), 
 #  endif
 
    _____(VG_DARWIN_SYSCALL_CONSTRUCT_MACH(11)), 
diff --git a/coregrind/m_ume/macho.c b/coregrind/m_ume/macho.c
index 142a3f9821..d6a662251e 100644
--- a/coregrind/m_ume/macho.c
+++ b/coregrind/m_ume/macho.c
@@ -82,6 +82,7 @@ static void check_mmap(SysRes res, Addr base, SizeT len, HChar* who)
    }
 }
 
+#if DARWIN_VERS == DARWIN_10_8
 static void check_mmap_float(SysRes res, SizeT len, HChar* who)
 {
    if (sr_isError(res)) {
@@ -90,7 +91,7 @@ static void check_mmap_float(SysRes res, SizeT len, HChar* who)
       VG_(exit)(1);
    }
 }
-
+#endif
 
 static int 
 load_thin_file(int fd, vki_off_t offset, vki_off_t size, unsigned long filetype, 
@@ -385,6 +386,7 @@ load_unixthread(vki_uint8_t **out_stack_start, vki_uint8_t **out_stack_end,
    This is a really nasty hack -- allocates 64M+stack size, then
    deallocates the 64M, to guarantee that the stack is at least 64M
    above zero. */
+#if DARWIN_VERS == DARWIN_10_8
 static int
 handle_lcmain ( vki_uint8_t **out_stack_start,
                 vki_uint8_t **out_stack_end,
@@ -414,7 +416,7 @@ handle_lcmain ( vki_uint8_t **out_stack_start,
 
    return 0;
 }
-
+#endif /* DARWIN_VERS == DARWIN_10_8 */