diff options
| author | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2006-06-12 07:00:49 +0800 |
|---|---|---|
| committer | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2006-06-12 07:00:49 +0800 |
| commit | 40a98f4bebbd8d9166e63ac60db6bfffc2fa030d (patch) | |
| tree | ec7c8677bac9e65245abb0c30057a95cc6ec7fff | |
| parent | c8ed6238cc983781082da140d9350e4e6bafeb86 (diff) | |
| download | marcuscom-ports-40a98f4bebbd8d9166e63ac60db6bfffc2fa030d.tar marcuscom-ports-40a98f4bebbd8d9166e63ac60db6bfffc2fa030d.tar.gz marcuscom-ports-40a98f4bebbd8d9166e63ac60db6bfffc2fa030d.tar.bz2 marcuscom-ports-40a98f4bebbd8d9166e63ac60db6bfffc2fa030d.tar.lz marcuscom-ports-40a98f4bebbd8d9166e63ac60db6bfffc2fa030d.tar.xz marcuscom-ports-40a98f4bebbd8d9166e63ac60db6bfffc2fa030d.tar.zst marcuscom-ports-40a98f4bebbd8d9166e63ac60db6bfffc2fa030d.zip | |
Fix build on -STABLE.
Submitted by: Yasuda Keisuke <kysd@po.harenet.ne.jp>
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@6401 df743ca5-7f9a-e211-a948-0013205c9059
3 files changed, 45 insertions, 9 deletions
diff --git a/accessibility/dasher/files/patch-Src_DasherCore_FileLogger.cpp b/accessibility/dasher/files/patch-Src_DasherCore_FileLogger.cpp index dfdda1351..6b5fdba4a 100644 --- a/accessibility/dasher/files/patch-Src_DasherCore_FileLogger.cpp +++ b/accessibility/dasher/files/patch-Src_DasherCore_FileLogger.cpp @@ -1,6 +1,15 @@ ---- 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 +--- Src/DasherCore/FileLogger.cpp.orig Fri Apr 21 17:41:01 2006 ++++ Src/DasherCore/FileLogger.cpp Sun Jun 11 07:33:19 2006 +@@ -511,7 +511,7 @@ + szTimeLine = ctime(&(sTimeBuffer.time)); + #else + gettimeofday(&sTimeBuffer, &sTimezoneBuffer); +- szTimeLine = ctime(&(sTimeBuffer.tv_sec)); ++ szTimeLine = ctime((const time_t *)&(sTimeBuffer.tv_sec)); + #endif + + // Format is: +@@ -538,7 +538,7 @@ #ifdef _WIN32 sprintf(strMs, "%d", sTimeBuffer.millitm); #else diff --git a/accessibility/dasher/files/patch-Src_DasherCore_TimeSpan.cpp b/accessibility/dasher/files/patch-Src_DasherCore_TimeSpan.cpp index 34b16ce25..d41cf9bed 100644 --- a/accessibility/dasher/files/patch-Src_DasherCore_TimeSpan.cpp +++ b/accessibility/dasher/files/patch-Src_DasherCore_TimeSpan.cpp @@ -1,6 +1,15 @@ ---- 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() +--- Src/DasherCore/TimeSpan.cpp.orig Fri Apr 21 17:41:02 2006 ++++ Src/DasherCore/TimeSpan.cpp Sun Jun 11 09:21:30 2006 +@@ -122,7 +122,7 @@ + szTimeLine = ctime(&(sTimeBuffer.time)); + #else + gettimeofday(&sTimeBuffer, &sTimezoneBuffer); +- szTimeLine = ctime(&(sTimeBuffer.tv_sec)); ++ szTimeLine = ctime((const time_t *)&(sTimeBuffer.tv_sec)); + #endif + + if ((szTimeLine != NULL) && (strlen(szTimeLine) > 18)) +@@ -134,7 +134,7 @@ #ifdef _WIN32 sprintf(szMs, "%d", sTimeBuffer.millitm); #else @@ -9,3 +18,12 @@ #endif if (strlen(szMs) == 1) strTimeStamp += "00"; +@@ -196,7 +196,7 @@ + szTimeLine = ctime(&(sTimeBuffer.time)); + #else + gettimeofday(&sTimeBuffer, &sTimezoneBuffer); +- szTimeLine = ctime(&(sTimeBuffer.tv_sec)); ++ szTimeLine = ctime((const time_t *)&(sTimeBuffer.tv_sec)); + #endif + + diff --git a/accessibility/dasher/files/patch-Src_DasherCore_UserLog.cpp b/accessibility/dasher/files/patch-Src_DasherCore_UserLog.cpp index fb4f4ae5d..663e5426e 100644 --- a/accessibility/dasher/files/patch-Src_DasherCore_UserLog.cpp +++ b/accessibility/dasher/files/patch-Src_DasherCore_UserLog.cpp @@ -1,6 +1,15 @@ ---- 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() +--- Src/DasherCore/UserLog.cpp.orig Fri Apr 21 17:41:02 2006 ++++ Src/DasherCore/UserLog.cpp Sun Jun 11 10:43:33 2006 +@@ -668,7 +668,7 @@ + szTimeLine = ctime(&(sTimeBuffer.time)); + #else + gettimeofday(&sTimeBuffer, &sTimezoneBuffer); +- szTimeLine = ctime(&(sTimeBuffer.tv_sec)); ++ szTimeLine = ctime((const time_t *)&(sTimeBuffer.tv_sec)); + #endif + + if ((szTimeLine != NULL) && (strlen(szTimeLine) > 18)) +@@ -881,7 +881,7 @@ double dTime = (sTimeBuffer.time * 1000.0) + sTimeBuffer.millitm; #else gettimeofday(&sTimeBuffer, &sTimezoneBuffer); |