diff --git a/include/wx/longlong.h b/include/wx/longlong.h
index 26f9e1c112..db1b4cef4c 100644
--- a/include/wx/longlong.h
+++ b/include/wx/longlong.h
@@ -45,15 +45,18 @@
 // NB: we #define and not typedef wxLongLong_t because we want to be able to
 //     use 'unsigned wxLongLong_t' as well and because we use "#ifdef
 //     wxLongLong_t" below
+
+// first check for generic cases which are long on 64bit machine and "long
+// long", then check for specific compilers
 #if defined(SIZEOF_LONG) && (SIZEOF_LONG == 8)
     #define wxLongLong_t long
     #define wxLongLongIsLong
+#elif defined(SIZEOF_LONG_LONG) && SIZEOF_LONG_LONG >= 8
+    #define wxLongLong_t long long
 #elif (defined(__VISUALC__) && defined(__WIN32__)) || defined( __VMS__ )
     #define wxLongLong_t __int64
 #elif defined(__BORLANDC__) && defined(__WIN32__) && (__BORLANDC__ >= 0x520)
     #define wxLongLong_t __int64
-#elif defined(__GNUG__) || defined(__sgi)
-    #define wxLongLong_t long long
 #elif defined(__MWERKS__)
     #if __option(longlong)
         #define wxLongLong_t long long
@@ -74,6 +77,7 @@
                     "Please report your compiler version to " \
                     "wx-dev@lists.wxwindows.org!"
 #endif
+
     #define wxUSE_LONGLONG_WX 1
 #endif // compiler