From fb67e2610b1307c1d0e8cc5a76aa58f022c94cb9 Mon Sep 17 00:00:00 2001
From: Matthew Flatt <mflatt@racket-lang.org>
Date: Fri, 11 Dec 2009 12:49:46 +0000
Subject: [PATCH] adjust large-file-support flag handling

svn: r17267
---
 src/configure             | 2 +-
 src/mzscheme/configure.ac | 2 +-
 src/mzscheme/src/jit.c    | 7 +++----
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/configure b/src/configure
index 408c45f899..b0acdacae6 100755
--- a/src/configure
+++ b/src/configure
@@ -7100,7 +7100,7 @@ fi
 LFS_CFLAGS=`getconf LFS_CFLAGS 2> /dev/null`
 if test "${LFS_CFLAGS}" != "" ; then
   echo "Large-file support: ${LFS_CFLAGS}"
-  PREFLAGS="${PREFLAGS} ${LFS_CFLAGS}"
+  MZOPTIONS="${MZOPTIONS} ${LFS_CFLAGS}"
 fi
 
 ###### Get data sizes, stack direction, and endianness #######
diff --git a/src/mzscheme/configure.ac b/src/mzscheme/configure.ac
index ded0b82323..266010fb79 100644
--- a/src/mzscheme/configure.ac
+++ b/src/mzscheme/configure.ac
@@ -914,7 +914,7 @@ fi
 LFS_CFLAGS=`getconf LFS_CFLAGS 2> /dev/null`
 if test "${LFS_CFLAGS}" != "" ; then
   echo "Large-file support: ${LFS_CFLAGS}"
-  PREFLAGS="${PREFLAGS} ${LFS_CFLAGS}"  
+  MZOPTIONS="${MZOPTIONS} ${LFS_CFLAGS}"  
 fi
 
 ###### Get data sizes, stack direction, and endianness #######
diff --git a/src/mzscheme/src/jit.c b/src/mzscheme/src/jit.c
index dbe1c4d715..45ad3125c6 100644
--- a/src/mzscheme/src/jit.c
+++ b/src/mzscheme/src/jit.c
@@ -2251,9 +2251,9 @@ static void ts_on_demand(void) XFORM_SKIP_PROC
 #ifdef MZ_PRECISE_GC
 static void *ts_prepare_retry_alloc(void *p, void *p2) XFORM_SKIP_PROC
 {
-  unsigned long ret;
-
   if (scheme_use_rtcall) {
+    unsigned long ret;
+  
     jit_future_storage[0] = p;
     jit_future_storage[1] = p2;
     ret = scheme_rtcall_alloc("[acquire_gc_page]", FSRC_OTHER);
@@ -2265,8 +2265,7 @@ static void *ts_prepare_retry_alloc(void *p, void *p2) XFORM_SKIP_PROC
     return p;
   }
 
-  ret = prepare_retry_alloc(p, p2);
-  return ret;
+  return prepare_retry_alloc(p, p2);
 }
 #endif