Fix for Bug #229543

[wxWidgets.git] / include / wx / longlong.h

diff --git a/include/wx/longlong.h b/include/wx/longlong.h
index dd35aafdd2d9d619b974a2e2000ca6b945bb65e2..e5f82a5f7a795d052d61c87c365771a84f8b0c29 100644 (file)
--- a/include/wx/longlong.h
+++ b/include/wx/longlong.h
@@ -52,7 +52,7 @@
     #define wxLongLong_t __int64
 #elif defined(__BORLANDC__) && defined(__WIN32__) && (__BORLANDC__ >= 0x520)
     #define wxLongLong_t __int64
     #define wxLongLong_t __int64
 #elif defined(__BORLANDC__) && defined(__WIN32__) && (__BORLANDC__ >= 0x520)
     #define wxLongLong_t __int64

-#elif defined(__GNUG__)
+#elif defined(__GNUG__) || defined(__sgi)

     #define wxLongLong_t long long
 #elif defined(__MWERKS__)
     #if __option(longlong)
     #define wxLongLong_t long long
 #elif defined(__MWERKS__)
     #if __option(longlong)


@@ -65,11 +65,14 @@
         #define wxLongLong_t long long
 #else // no native long long type
     // both warning and pragma warning are not portable, but at least an
         #define wxLongLong_t long long
 #else // no native long long type
     // both warning and pragma warning are not portable, but at least an

-    // unknown pragma should never be an error - unless the compiler is
-    // seriously broken as Watcom C++ seems to be...
-#ifndef __WATCOMC__
+    // unknown pragma should never be an error - except that, actually, some
+    // broken compilers don't like it, so we have to disable it in this case
+    // <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
     #define wxUSE_LONGLONG_WX 1
 #endif // compiler
 #endif
     #define wxUSE_LONGLONG_WX 1
 #endif // compiler