From cbf9307ad9c4827efc5488f8ee6722a96855ffa4 Mon Sep 17 00:00:00 2001
From: Bryce Denney <bryce@tlw.com>
Date: Wed, 2 Oct 2002 19:23:01 +0000
Subject: [PATCH] - workaround for SDL compile problem on MacOS X

---
 bochs/main.cc | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/bochs/main.cc b/bochs/main.cc
index 5b100ac7e..4bb257244 100644
--- a/bochs/main.cc
+++ b/bochs/main.cc
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////
-// $Id: main.cc,v 1.154 2002-10-01 23:34:52 bdenney Exp $
+// $Id: main.cc,v 1.155 2002-10-02 19:23:01 bdenney Exp $
 /////////////////////////////////////////////////////////////////////////
 //
 //  Copyright (C) 2002  MandrakeSoft S.A.
@@ -34,6 +34,13 @@
 // C language prototype is found.  Otherwise SDL_main() will get its name 
 // mangled and not match what the SDL library is expecting.
 #include <SDL/SDL.h>
+
+#if defined(macintosh)
+// Work around a bug in SDL 1.2.4 on MacOS X, which redefines getenv to
+// SDL_getenv, but then neglects to provide SDL_getenv.  It happens
+// because we are defining -Dmacintosh.
+#undef getenv
+#endif
 #endif
 
 int enable_config_interface = 1;