X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a4d2944e64d800134e26e36d7883b0914bc1f78d..467e04791c0d5914dc8ed8e535af607f7fc1dfe1:/include/wx/longlong.h?ds=sidebyside

diff --git a/include/wx/longlong.h b/include/wx/longlong.h
index 366ba7270f..5ceca3c77b 100644
--- a/include/wx/longlong.h
+++ b/include/wx/longlong.h
@@ -129,10 +129,12 @@ public:
 
     // assignment operators
         // from native 64 bit integer
+#ifndef wxLongLongIsLong
     wxLongLongNative& operator=(wxLongLong_t ll)
         { m_ll = ll; return *this; }
     wxLongLongNative& operator=(wxULongLong_t ll)
         { m_ll = ll; return *this; }
+#endif // !wxLongLongNative
     wxLongLongNative& operator=(const wxULongLongNative &ll);
     wxLongLongNative& operator=(int l)
         { m_ll = l; return *this; }
@@ -363,10 +365,12 @@ public:
 
     // assignment operators
         // from native 64 bit integer
+#ifndef wxLongLongIsLong
     wxULongLongNative& operator=(wxULongLong_t ll)
         { m_ll = ll; return *this; }
     wxULongLongNative& operator=(wxLongLong_t ll)
         { m_ll = ll; return *this; }
+#endif // !wxLongLongNative
     wxULongLongNative& operator=(int l)
         { m_ll = l; return *this; }
     wxULongLongNative& operator=(long l)