fixes for Metrowerks command line compiler (avoid redefining stuff already defined by configure)

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29614 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2004-10-02 23:19:07 +00:00
parent 413a490f94
commit 74c719ed96

View File

@@ -15,6 +15,8 @@
// headers // headers
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
#include <pwd.h>
// for compilers that support precompilation, includes "wx.h". // for compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h" #include "wx/wxprec.h"
@@ -44,10 +46,24 @@
#if wxUSE_BASE #if wxUSE_BASE
#if defined( __MWERKS__ ) && defined(__MACH__) #if defined(__MWERKS__) && defined(__MACH__)
#define WXWIN_OS_DESCRIPTION "MacOS X" #ifndef WXWIN_OS_DESCRIPTION
#define HAVE_NANOSLEEP #define WXWIN_OS_DESCRIPTION "MacOS X"
#define HAVE_UNAME #endif
#ifndef HAVE_NANOSLEEP
#define HAVE_NANOSLEEP
#endif
#ifndef HAVE_UNAME
#define HAVE_UNAME
#endif
// our configure test believes we can use sigaction() if the function is
// available but Metrowekrs with MSL run-time does have the function but
// doesn't have sigaction struct so finally we can't use it...
#ifdef __MSL__
#undef wxUSE_ON_FATAL_EXCEPTION
#define wxUSE_ON_FATAL_EXCEPTION 0
#endif
#endif #endif
// not only the statfs syscall is called differently depending on platform, but // not only the statfs syscall is called differently depending on platform, but
@@ -90,7 +106,6 @@
#include <sys/types.h> #include <sys/types.h>
#include <sys/wait.h> #include <sys/wait.h>
#include <unistd.h> #include <unistd.h>
#include <pwd.h>
#include <errno.h> #include <errno.h>
#include <netdb.h> #include <netdb.h>
#include <signal.h> #include <signal.h>