From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Mon, 13 Feb 2006 00:26:33 +0000 (+0000)
Subject: blind compilation fix for 64 bit systems after last commit
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/38b2e0de1806b8c5e723cdd04d20ce2b911ed5c4

blind compilation fix for 64 bit systems after last commit


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37545 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---

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)