removed support for Salford compiler (which was almost certainly broken anyhow) (patch 1861133)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@50960 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -103,15 +103,6 @@
|
||||
#endif /* VC++ 8 */
|
||||
#endif /* __VISUALC__ */
|
||||
|
||||
/* suppress some Salford C++ warnings */
|
||||
#ifdef __SALFORDC__
|
||||
# pragma suppress 353 /* Possible nested comments */
|
||||
# pragma suppress 593 /* Define not used */
|
||||
# pragma suppress 61 /* enum has no name (doesn't suppress!) */
|
||||
# pragma suppress 106 /* unnamed, unused parameter */
|
||||
# pragma suppress 571 /* Virtual function hiding */
|
||||
#endif /* __SALFORDC__ */
|
||||
|
||||
/* suppress some Borland C++ warnings */
|
||||
#ifdef __BORLANDC__
|
||||
# pragma warn -inl /* Functions containing reserved words and certain constructs are not expanded inline */
|
||||
|
@@ -96,8 +96,7 @@ protected:
|
||||
#if defined(__WXUNIVERSAL__)
|
||||
#include "wx/generic/dirdlgg.h"
|
||||
#define wxDirDialog wxGenericDirDialog
|
||||
#elif defined(__WXMSW__) && (defined(__SALFORDC__) || \
|
||||
!wxUSE_OLE || \
|
||||
#elif defined(__WXMSW__) && (!wxUSE_OLE || \
|
||||
(defined (__GNUWIN32__) && !wxUSE_NORLANDER_HEADERS))
|
||||
#include "wx/generic/dirdlgg.h"
|
||||
#define wxDirDialog wxGenericDirDialog
|
||||
|
@@ -60,7 +60,7 @@
|
||||
#endif
|
||||
|
||||
#if defined(__WINDOWS__) && !defined(__WXMICROWIN__)
|
||||
#if !defined( __GNUWIN32__ ) && !defined( __MWERKS__ ) && !defined(__SALFORDC__) && !defined(__WXWINCE__) && !defined(__CYGWIN__)
|
||||
#if !defined( __GNUWIN32__ ) && !defined( __MWERKS__ ) && !defined(__WXWINCE__) && !defined(__CYGWIN__)
|
||||
#include <direct.h>
|
||||
#include <dos.h>
|
||||
#include <io.h>
|
||||
@@ -85,11 +85,6 @@
|
||||
#include <dir.h>
|
||||
#endif
|
||||
|
||||
#ifdef __SALFORDC__
|
||||
#include <dir.h>
|
||||
#include <unix.h>
|
||||
#endif
|
||||
|
||||
#ifndef __WXPALMOS5__
|
||||
#ifndef __WXWINCE__
|
||||
#include <fcntl.h> // O_RDONLY &c
|
||||
|
@@ -548,10 +548,6 @@ protected:
|
||||
void *data,
|
||||
const wxListKey& key = wxDefaultListKey) = 0;
|
||||
|
||||
// Can't access these from derived classes otherwise (bug in Salford C++?)
|
||||
#ifdef __SALFORDC__
|
||||
public:
|
||||
#endif
|
||||
|
||||
// ctors
|
||||
// from an array
|
||||
|
@@ -133,8 +133,6 @@ inline int Stricmp(const char *psz1, const char *psz2)
|
||||
return _stricmp(psz1, psz2);
|
||||
#elif defined(__SC__)
|
||||
return _stricmp(psz1, psz2);
|
||||
#elif defined(__SALFORDC__)
|
||||
return stricmp(psz1, psz2);
|
||||
#elif defined(__BORLANDC__)
|
||||
return stricmp(psz1, psz2);
|
||||
#elif defined(__WATCOMC__)
|
||||
|
@@ -229,7 +229,7 @@ WXDLLIMPEXP_BASE void *calloc( size_t num, size_t size );
|
||||
* versions */
|
||||
#if !defined(wxCRT_StricmpA)
|
||||
#if defined(__BORLANDC__) || defined(__WATCOMC__) || \
|
||||
defined(__SALFORDC__) || defined(__VISAGECPP__) || \
|
||||
defined(__VISAGECPP__) || \
|
||||
defined(__EMX__) || defined(__DJGPP__)
|
||||
#define wxCRT_StricmpA stricmp
|
||||
#define wxCRT_StrnicmpA strnicmp
|
||||
|
Reference in New Issue
Block a user