Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Applied patch [ 814047 ] fixes to enable compiling on gcc 3.3

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@24746 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2003-12-11 09:14:56 +00:00
parent 14df3528d4
commit d93d69edff
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/common/longlong.cpp
View File

@@ -1075,7 +1075,7 @@ wxLongLongWx::ToString() const
wxLongLong ll = *this; wxLongLong ll = *this;
bool neg; bool neg;
if ( ll < 0 ) if ( ll < 0L )
{ {
ll.Negate(); ll.Negate();
neg = TRUE; neg = TRUE;
@@ -1085,9 +1085,9 @@ wxLongLongWx::ToString() const
neg = FALSE; neg = FALSE;
} }
while ( ll != 0 ) while ( ll != 0L )
{ {
result.Prepend((wxChar)(_T('0') + (ll % 10).ToLong())); result.Prepend((wxChar)(_T('0') + (ll % 10L).ToLong()));
ll /= 10; ll /= 10;
} }

4
src/common/timercmn.cpp
View File

@@ -167,7 +167,7 @@ bool wxTimerBase::Start(int milliseconds, bool oneShot)
void wxStopWatch::Start(long t) void wxStopWatch::Start(long t)
{ {
m_t0 = wxGetLocalTimeMillis() - t; m_t0 = wxGetLocalTimeMillis() - (wxLongLong)t;
m_pause = 0; m_pause = 0;
m_pauseCount = 0; m_pauseCount = 0;
} }
@@ -329,7 +329,7 @@ wxLongLong wxGetLocalTimeMillis()
if ( wxGetTimeOfDay(&tp, (struct timezone *)NULL) != -1 ) if ( wxGetTimeOfDay(&tp, (struct timezone *)NULL) != -1 )
{ {
val *= tp.tv_sec; val *= tp.tv_sec;
return (val + (tp.tv_usec / 1000)); return (val + (wxLongLong)(tp.tv_usec / 1000));
} }
else else
{ {

2
src/unix/threadpsx.cpp
View File

@@ -374,7 +374,7 @@ wxCondError wxConditionInternal::WaitTimeout(unsigned long milliseconds)
{ {
wxLongLong curtime = wxGetLocalTimeMillis(); wxLongLong curtime = wxGetLocalTimeMillis();
curtime += milliseconds; curtime += milliseconds;
wxLongLong temp = curtime / 1000; wxLongLong temp = curtime / 1000L;
int sec = temp.GetLo(); int sec = temp.GetLo();
temp *= 1000; temp *= 1000;
temp = curtime - temp; temp = curtime - temp;