Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Found the RIGHT place to make the __unix__ fix.

Browse Source 
Undoing the other changes I just made.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@793 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
1998-09-30 23:37:45 +00:00
parent 297a3fece1
commit d4b67f95d2
2 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
include/wx/defs.h
View File

@@ -30,11 +30,11 @@
#include "wx/version.h" #include "wx/version.h"
// Helps SGI compilation, apparently // Helps SGI compilation, apparently
#if defined(__SGI__) #if defined(__SGI__)
#if defined(__GNUG__) #if defined(__GNUG__)
#define __need_wchar_t #define __need_wchar_t
#else #else
/* Note I use the term __SGI_CC__ for both cc and CC, its not a good idea to /* Note I use the term __SGI_CC__ for both cc and CC, its not a good idea to
* mix gcc and cc/CC, the name mangling is different */ * mix gcc and cc/CC, the name mangling is different */
#define __SGI_CC__ #define __SGI_CC__
#endif #endif
@@ -210,13 +210,13 @@ enum ErrCode
// be considered as an error by some overzealous debugging implementations of // be considered as an error by some overzealous debugging implementations of
// the library, so we do it ourselves) // the library, so we do it ourselves)
#if defined(__SGI_CC__) #if defined(__SGI_CC__)
// Okay this is bad styling, but the native SGI compiler is very picky, it // Okay this is bad styling, but the native SGI compiler is very picky, it
// wont let you compare/assign between a NULL (void *) and another pointer // wont let you compare/assign between a NULL (void *) and another pointer
// type. To be really clean we'd need to pass in another argument, the type // type. To be really clean we'd need to pass in another argument, the type
// of p. // of p.
// Also note the use of 0L, this would allow future possible 64bit support // Also note the use of 0L, this would allow future possible 64bit support
// (as yet untested) by ensuring that we zero all the bits in a pointer // (as yet untested) by ensuring that we zero all the bits in a pointer
// (which is always the same length as a long (at least with the LP64 standard) // (which is always the same length as a long (at least with the LP64 standard)
// --- offer aug 98 // --- offer aug 98
#define wxDELETE(p) if ( (p) ) { delete (p); p = 0L; } #define wxDELETE(p) if ( (p) ) { delete (p); p = 0L; }
#else #else
@@ -243,7 +243,7 @@ WXDLLEXPORT_DATA(extern const bool) wxFalse;
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// OS // OS
#if defined(__HPUX__) || defined(____SVR4____) || defined(__LINUX__) || defined(__sgi ) #if defined(__HPUX__) || defined(____SVR4____) || defined(__LINUX__) || defined(__sgi ) || defined(__unix__)
#ifndef __UNIX__ #ifndef __UNIX__
#define __UNIX__ #define __UNIX__
#endif #endif
@@ -270,7 +270,7 @@ WXDLLEXPORT_DATA(extern const bool) wxFalse;
// warnings just must be disabled // warnings just must be disabled
#ifdef __VISUALC__ #ifdef __VISUALC__
#pragma warning(disable: 4514) // unreferenced inline func has been removed #pragma warning(disable: 4514) // unreferenced inline func has been removed
/* /*
you might be tempted to disable this one also: triggered by CHECK and FAIL you might be tempted to disable this one also: triggered by CHECK and FAIL
macros in debug.h, but it's, overall, is a rather useful one, so I leave it macros in debug.h, but it's, overall, is a rather useful one, so I leave it
and will try to find some way to disable this warning just for CHECK/FAIL. and will try to find some way to disable this warning just for CHECK/FAIL.
@@ -294,7 +294,7 @@ typedef void (*wxFunction) (wxObject&, wxEvent&);
* Window (cross-group) styles now take up the first half * Window (cross-group) styles now take up the first half
* of the flag, and control-specific styles the * of the flag, and control-specific styles the
* second half. * second half.
* *
*/ */
/* /*
@@ -373,7 +373,7 @@ typedef void (*wxFunction) (wxObject&, wxEvent&);
/* /*
* wxToolBar style flags * wxToolBar style flags
*/ */
#define wxTB_3DBUTTONS 0x8000 #define wxTB_3DBUTTONS 0x8000
#define wxTB_HORIZONTAL 0x0002 #define wxTB_HORIZONTAL 0x0002
#define wxTB_VERTICAL 0x0004 #define wxTB_VERTICAL 0x0004
@@ -383,7 +383,7 @@ typedef void (*wxFunction) (wxObject&, wxEvent&);
/* /*
* Apply to all panel items * Apply to all panel items
*/ */
#define wxCOLOURED 0x0800 #define wxCOLOURED 0x0800
// Alignment for panel item labels: replaces characters with zeros // Alignment for panel item labels: replaces characters with zeros
// when creating label, so spaces can be included in string for alignment. // when creating label, so spaces can be included in string for alignment.
@@ -445,7 +445,7 @@ typedef void (*wxFunction) (wxObject&, wxEvent&);
/* /*
* wxSlider flags * wxSlider flags
*/ */
#define wxSL_HORIZONTAL wxHORIZONTAL #define wxSL_HORIZONTAL wxHORIZONTAL
#define wxSL_VERTICAL wxVERTICAL #define wxSL_VERTICAL wxVERTICAL
// The next one is obsolete - use scroll events instead // The next one is obsolete - use scroll events instead
@@ -463,7 +463,7 @@ typedef void (*wxFunction) (wxObject&, wxEvent&);
/* /*
* wxScrollBar flags * wxScrollBar flags
*/ */
#define wxSB_HORIZONTAL wxHORIZONTAL #define wxSB_HORIZONTAL wxHORIZONTAL
#define wxSB_VERTICAL wxVERTICAL #define wxSB_VERTICAL wxVERTICAL

2
include/wx/string.h
View File

@@ -87,7 +87,7 @@ inline int WXDLLEXPORT Stricmp(const char *psz1, const char *psz2)
return _stricmp(psz1, psz2); return _stricmp(psz1, psz2);
#elif defined(__BORLANDC__) #elif defined(__BORLANDC__)
return stricmp(psz1, psz2); return stricmp(psz1, psz2);
#elif defined(__UNIX__) || defined(__unix__) || defined(__GNUWIN32__) #elif defined(__UNIX__) || defined(__GNUWIN32__)
return strcasecmp(psz1, psz2); return strcasecmp(psz1, psz2);
#else #else
// almost all compilers/libraries provide this function (unfortunately under // almost all compilers/libraries provide this function (unfortunately under