merged __sgi compilation fix

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9560 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2001-03-21 14:22:19 +00:00
parent 2f3dcbbf20
commit 58ef67abc3

View File

@@ -52,7 +52,7 @@
#define wxLongLong_t __int64 #define wxLongLong_t __int64
#elif defined(__BORLANDC__) && defined(__WIN32__) && (__BORLANDC__ >= 0x520) #elif defined(__BORLANDC__) && defined(__WIN32__) && (__BORLANDC__ >= 0x520)
#define wxLongLong_t __int64 #define wxLongLong_t __int64
#elif defined(__GNUG__) #elif defined(__GNUG__) || defined(__sgi)
#define wxLongLong_t long long #define wxLongLong_t long long
#elif defined(__MWERKS__) #elif defined(__MWERKS__)
#if __option(longlong) #if __option(longlong)
@@ -65,11 +65,14 @@
#define wxLongLong_t long long #define wxLongLong_t long long
#else // no native long long type #else // no native long long type
// both warning and pragma warning are not portable, but at least an // both warning and pragma warning are not portable, but at least an
// unknown pragma should never be an error - unless the compiler is // unknown pragma should never be an error - except that, actually, some
// seriously broken as Watcom C++ seems to be... // broken compilers don't like it, so we have to disable it in this case
#if (!(defined(__WATCOMC__) || defined(__VISAGECPP__))) // <sigh>
#if !(defined(__WATCOMC__) || defined(__VISAGECPP__))
#pragma warning "Your compiler does not appear to support 64 bit "\ #pragma warning "Your compiler does not appear to support 64 bit "\
"integers, using emulation class instead." "integers, using emulation class instead.\n" \
"Please report your compiler version to " \
"wx-dev@lists.wxwindows.org!"
#endif #endif
#define wxUSE_LONGLONG_WX 1 #define wxUSE_LONGLONG_WX 1
#endif // compiler #endif // compiler