From 627331f8e0aa329ba095dac23227818a745df5d4 Mon Sep 17 00:00:00 2001 From: marcus Date: Wed, 31 May 2006 04:18:52 +0000 Subject: Re-fix the build on 6.X and earlier. Reported by: kaeru on #freebsd-gnome git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@6355 df743ca5-7f9a-e211-a948-0013205c9059 --- .../files/patch-Src_DasherCore_FileLogger.cpp | 11 ++++++++++ .../files/patch-Src_DasherCore_SimpleTimer.cpp | 24 ++++++++++++++++++++++ .../dasher/files/patch-Src_DasherCore_TimeSpan.cpp | 11 ++++++++++ .../dasher/files/patch-Src_DasherCore_UserLog.cpp | 11 ++++++++++ 4 files changed, 57 insertions(+) create mode 100644 accessibility/dasher/files/patch-Src_DasherCore_FileLogger.cpp create mode 100644 accessibility/dasher/files/patch-Src_DasherCore_SimpleTimer.cpp create mode 100644 accessibility/dasher/files/patch-Src_DasherCore_TimeSpan.cpp create mode 100644 accessibility/dasher/files/patch-Src_DasherCore_UserLog.cpp (limited to 'accessibility/dasher') diff --git a/accessibility/dasher/files/patch-Src_DasherCore_FileLogger.cpp b/accessibility/dasher/files/patch-Src_DasherCore_FileLogger.cpp new file mode 100644 index 000000000..dfdda1351 --- /dev/null +++ b/accessibility/dasher/files/patch-Src_DasherCore_FileLogger.cpp @@ -0,0 +1,11 @@ +--- Src/DasherCore/FileLogger.cpp.orig Wed May 31 00:12:32 2006 ++++ Src/DasherCore/FileLogger.cpp Wed May 31 00:12:43 2006 +@@ -538,7 +538,7 @@ std::string CFileLogger::GetTimeDateStam + #ifdef _WIN32 + sprintf(strMs, "%d", sTimeBuffer.millitm); + #else +- sprintf(strMs, "%d", sTimeBuffer.tv_usec / 1000); ++ sprintf(strMs, "%d", (int) (sTimeBuffer.tv_usec / 1000)); + #endif + if (strlen(strMs) == 1) + strTimeStamp += "00"; diff --git a/accessibility/dasher/files/patch-Src_DasherCore_SimpleTimer.cpp b/accessibility/dasher/files/patch-Src_DasherCore_SimpleTimer.cpp new file mode 100644 index 000000000..745c41f85 --- /dev/null +++ b/accessibility/dasher/files/patch-Src_DasherCore_SimpleTimer.cpp @@ -0,0 +1,24 @@ +--- Src/DasherCore/SimpleTimer.cpp.orig Wed May 31 00:14:12 2006 ++++ Src/DasherCore/SimpleTimer.cpp Wed May 31 00:14:23 2006 +@@ -34,8 +34,8 @@ CSimpleTimer::CSimpleTimer() + m_iStartSecond = sTimeBuffer.time; + #else + gettimeofday(&sTimeBuffer, &sTimezoneBuffer); +- m_iStartMs = sTimeBuffer.tv_usec / 1000; +- m_iStartSecond = sTimeBuffer.tv_sec; ++ m_iStartMs = (int) sTimeBuffer.tv_usec / 1000; ++ m_iStartSecond = (int) sTimeBuffer.tv_sec; + #endif + + } +@@ -59,8 +59,8 @@ double CSimpleTimer::GetElapsed() + int iEndSecond = sTimeBuffer.time; + #else + gettimeofday(&sTimeBuffer, &sTimezoneBuffer); +- int iEndMs = sTimeBuffer.tv_usec / 1000; +- int iEndSecond = sTimeBuffer.tv_sec; ++ int iEndMs = (int) sTimeBuffer.tv_usec / 1000; ++ int iEndSecond = (int) sTimeBuffer.tv_sec; + #endif + + diff --git a/accessibility/dasher/files/patch-Src_DasherCore_TimeSpan.cpp b/accessibility/dasher/files/patch-Src_DasherCore_TimeSpan.cpp new file mode 100644 index 000000000..34b16ce25 --- /dev/null +++ b/accessibility/dasher/files/patch-Src_DasherCore_TimeSpan.cpp @@ -0,0 +1,11 @@ +--- Src/DasherCore/TimeSpan.cpp.orig Wed May 31 00:14:59 2006 ++++ Src/DasherCore/TimeSpan.cpp Wed May 31 00:15:07 2006 +@@ -134,7 +134,7 @@ string CTimeSpan::GetTimeStamp() + #ifdef _WIN32 + sprintf(szMs, "%d", sTimeBuffer.millitm); + #else +- sprintf(szMs, "%d", sTimeBuffer.tv_usec / 1000); ++ sprintf(szMs, "%d", (int) (sTimeBuffer.tv_usec / 1000)); + #endif + if (strlen(szMs) == 1) + strTimeStamp += "00"; diff --git a/accessibility/dasher/files/patch-Src_DasherCore_UserLog.cpp b/accessibility/dasher/files/patch-Src_DasherCore_UserLog.cpp new file mode 100644 index 000000000..fb4f4ae5d --- /dev/null +++ b/accessibility/dasher/files/patch-Src_DasherCore_UserLog.cpp @@ -0,0 +1,11 @@ +--- Src/DasherCore/UserLog.cpp.orig Wed May 31 00:15:35 2006 ++++ Src/DasherCore/UserLog.cpp Wed May 31 00:16:03 2006 +@@ -881,7 +881,7 @@ bool CUserLog::UpdateMouseLocation() + double dTime = (sTimeBuffer.time * 1000.0) + sTimeBuffer.millitm; + #else + gettimeofday(&sTimeBuffer, &sTimezoneBuffer); +- double dTime = (sTimeBuffer.tv_sec * 1000.0) + sTimeBuffer.tv_usec / 1000; ++ double dTime = (sTimeBuffer.tv_sec * 1000.0) + (int) (sTimeBuffer.tv_usec / 1000); + #endif + + -- cgit v1.2.3