From 9cde1f3e535ece951ec71668af6b7b969f45edf2 Mon Sep 17 00:00:00 2001
From: stephena <stephena@8b62c5a3-ac7e-4cc8-8f21-d9a121418aba>
Date: Sun, 22 Nov 2009 20:36:07 +0000
Subject: [PATCH] Some cleanups to the BSPF class.

OSX plist file should use 10.4 as the minimum for the i386 version, not 10.5.
Otherwise, all Tiger users would be excluded from the next release.


git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@1911 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
---
 src/common/bspf.hxx             | 14 ++++----------
 src/macosx/Info-StellaOSX.plist |  2 +-
 2 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/src/common/bspf.hxx b/src/common/bspf.hxx
index 406a64b2e..b563801bc 100644
--- a/src/common/bspf.hxx
+++ b/src/common/bspf.hxx
@@ -62,16 +62,10 @@
 
 // The following code should provide access to the standard C++ objects and
 // types: cout, cerr, string, ostream, istream, etc.
-#ifdef BSPF_OLD_STYLE_CXX_HEADERS
-  #include <iostream.h>
-  #include <iomanip.h>
-  #include <string>
-#else
-  #include <iostream>
-  #include <iomanip>
-  #include <string>
-  using namespace std;
-#endif
+#include <iostream>
+#include <iomanip>
+#include <string>
+using namespace std;
 
 #include <algorithm>
 
diff --git a/src/macosx/Info-StellaOSX.plist b/src/macosx/Info-StellaOSX.plist
index ede76724b..62c8a395c 100644
--- a/src/macosx/Info-StellaOSX.plist
+++ b/src/macosx/Info-StellaOSX.plist
@@ -63,7 +63,7 @@
 		<key>x86_64</key>
 		<string>10.6.0</string>
 		<key>i386</key>
-		<string>10.5.0</string>
+		<string>10.4.0</string>
 		<key>ppc</key>
 		<string>10.4.0</string>
 	</dict>