diff --git a/configure.in b/configure.in
index c7c45fc2c..264017d8e 100644
--- a/configure.in
+++ b/configure.in
@@ -889,6 +889,12 @@ if test -n "$GCC"; then
     # The following additional warnings are useful for tracking down problems...
     #OPTIM="-Wshadow -Wconversion $OPTIM"
 
+    # We know that Carbon is deprecated on OS X 10.4. To avoid hundreds of warnings
+    # we will temporarily disable 'deprecated' warnings on OS X.
+    if test "$uname" = "Darwin" -a $uversion -ge 800; then
+        OPTIM="-Wno-deprecated-declarations $OPTIM"
+    fi
+
     # Set the default compiler optimizations...
     if test -z "$DEBUGFLAG"; then
     	#
diff --git a/test/blocks.cxx b/test/blocks.cxx
index 90707cc34..02999d6f2 100644
--- a/test/blocks.cxx
+++ b/test/blocks.cxx
@@ -735,7 +735,7 @@ BlockWindow::handle(int event) {
 
   switch (event) {
     case FL_PUSH :
-        mx    = w() - Fl::event_x() + BLOCK_SIZE;
+	mx    = w() - Fl::event_x() + BLOCK_SIZE;
 	my    = h() - Fl::event_y();
 	count = 0;
 	b     = 0;
diff --git a/test/threads.cxx b/test/threads.cxx
index eece135f7..38444410b 100644
--- a/test/threads.cxx
+++ b/test/threads.cxx
@@ -70,7 +70,14 @@ void* prime_func(void* p)
   }
 
   // very simple prime number calculator !
-  for (;;) {
+  //
+  // The return at the end of this function can never be reached and thus 
+  // will generate a warning with some compilers, however we need to have 
+  // a return statement or other compilers will complain there is no return 
+  // statement. To avoid warnings on all compilers, we fool the smart ones 
+  // into beleiving that there is a chance that we reach the end by testing 
+  // n>=0, knowing that logically, n will never be negative in this context.
+  if (n>=0) for (;;) {
     int pp;
     int hn = (int)sqrt((double)n);
 
@@ -108,11 +115,7 @@ void* prime_func(void* p)
       Fl::unlock();
     }
   }
-  // This return can never be reached and thus will generate a warning with
-  // some compilers, however we need to have a return statement or other
-  // compilers will complain there is no return statement...  You can't
-  // win sometimes... :(
-  return 0;
+  return 0L;
 }
 
 int main(int argc, char **argv)