diff --git a/configure b/configure index f0afe1c6bf..82162e94b2 100755 --- a/configure +++ b/configure @@ -34369,12 +34369,6 @@ else #include #include - #ifdef __MSL__ - #if __MSL__ >= 0x6000 - namespace std {} - using namespace std; - #endif - #endif int main () @@ -34476,12 +34470,6 @@ else #include #include - #ifdef __MSL__ - #if __MSL__ >= 0x6000 - namespace std {} - using namespace std; - #endif - #endif int main () diff --git a/configure.in b/configure.in index 7e8f5c4db8..1af9b74405 100644 --- a/configure.in +++ b/configure.in @@ -4285,12 +4285,6 @@ if test "$wx_cv_func_vsnprintf" = "yes"; then [ #include #include - #ifdef __MSL__ - #if __MSL__ >= 0x6000 - namespace std {} - using namespace std; - #endif - #endif ], [ char *buf; @@ -4359,12 +4353,6 @@ if test "$wx_cv_func_vsscanf" = "yes"; then [ #include #include - #ifdef __MSL__ - #if __MSL__ >= 0x6000 - namespace std {} - using namespace std; - #endif - #endif ], [ const char *buf; diff --git a/src/common/file.cpp b/src/common/file.cpp index e94a30c814..25e01de558 100644 --- a/src/common/file.cpp +++ b/src/common/file.cpp @@ -54,11 +54,7 @@ // Have to ifdef this for different environments #include #elif (defined(__WXMAC__)) -#if __MSL__ < 0x6000 int access( const char *path, int mode ) { return 0 ; } -#else - int _access( const char *path, int mode ) { return 0 ; } -#endif char* mktemp( char * path ) { return path ;} #include #include diff --git a/src/osx/carbon/graphics.cpp b/src/osx/carbon/graphics.cpp index 77585ff9d0..cd19f3c928 100644 --- a/src/osx/carbon/graphics.cpp +++ b/src/osx/carbon/graphics.cpp @@ -24,15 +24,6 @@ #endif -#ifdef __MSL__ - #if __MSL__ >= 0x6000 - #include "math.h" - // in case our functions were defined outside std, we make it known all the same - namespace std { } - using namespace std; - #endif -#endif - #ifdef __WXMAC__ #include "wx/osx/private.h" #include "wx/osx/dcprint.h"