From 84c0893e2b1ce21395d0daa1cb495bb2154721a8 Mon Sep 17 00:00:00 2001
From: Matthew Flatt <mflatt@racket-lang.org>
Date: Sun, 9 Mar 2008 13:25:32 +0000
Subject: [PATCH] fix bug in round uner Solaris

svn: r8934
---
 src/mzscheme/configure.ac | 9 ++++++++-
 src/mzscheme/src/number.c | 2 +-
 src/mzscheme/src/numstr.c | 3 +--
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/mzscheme/configure.ac b/src/mzscheme/configure.ac
index e08f061127..f90b2b9800 100644
--- a/src/mzscheme/configure.ac
+++ b/src/mzscheme/configure.ac
@@ -587,8 +587,15 @@ case $OS in
     fi
     ;;
   Darwin)
+
+    if test -d "/Developer/SDKs/MacOSX10.4u.sdk"; then
+      PREFLAGS="$PREFLAGS -I/Developer/SDKs/MacOSX10.4u.sdk/usr/include"
+      PREFLAGS="$PREFLAGS -F/Developer/SDKs/MacOSX10.4u.sdk/System/Library/Frameworks/"
+      LDFLAGS="$LDFLAGS -L/Developer/SDKs/MacOSX10.4u.sdk/usr/lib"
+      LDFLAGS="$LDFLAGS -F/Developer/SDKs/MacOSX10.4u.sdk/System/Library/Frameworks/"
+    fi
     
-    PREFLAGS="$PREFLAGS -D_DARWIN_UNLIMITED_SELECT -DOS_X"
+    PREFLAGS="$PREFLAGS -DOS_X -D_DARWIN_UNLIMITED_SELECT"
 
     # zlib comes with the OS
     ZLIB_A=""
diff --git a/src/mzscheme/src/number.c b/src/mzscheme/src/number.c
index a187de893f..c51ab8554e 100644
--- a/src/mzscheme/src/number.c
+++ b/src/mzscheme/src/number.c
@@ -1221,7 +1221,7 @@ sch_round (int argc, Scheme_Object *argv[])
 
 #ifdef FMOD_CAN_RETURN_POS_ZERO
     if (minus_zero_p(d))
-      return d;
+      return o;
 #endif
 
     if (d < 0) {
diff --git a/src/mzscheme/src/numstr.c b/src/mzscheme/src/numstr.c
index d86660d618..01df3e03ac 100644
--- a/src/mzscheme/src/numstr.c
+++ b/src/mzscheme/src/numstr.c
@@ -1624,8 +1624,7 @@ static Scheme_Object *bytes_to_integer (int argc, Scheme_Object *argv[])
 
   if (!SCHEME_BYTE_STRINGP(argv[0]))
     scheme_wrong_type("integer-bytes->integer", "byte string", 0, argc, argv);
-  else
-    strlen = SCHEME_BYTE_STRLEN_VAL(argv[0]);
+  strlen = SCHEME_BYTE_STRLEN_VAL(argv[0]);
 
   str = SCHEME_BYTE_STR_VAL(argv[0]);