From fcb9fb91ff1a9795a484a2fd89728a13f7b2ba11 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sun, 2 Mar 2008 01:16:14 +0000 Subject: [PATCH] workarounds for Palm compiler errors (pacc-error.diff part of patch 1894861) git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@52233 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/common/filefn.cpp | 5 +++++ src/common/sysopt.cpp | 7 ++++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/src/common/filefn.cpp b/src/common/filefn.cpp index c23f02bf1c..f0bfce34c2 100644 --- a/src/common/filefn.cpp +++ b/src/common/filefn.cpp @@ -1373,7 +1373,12 @@ wxChar *wxGetTempFileName(const wxString& prefix, wxChar *buf) return NULL; if ( buf ) +#ifdef _PACC_VER + // work around the PalmOS pacc compiler bug + wxStrcpy(buf, filename.data()); +#else wxStrcpy(buf, filename); +#endif else buf = MYcopystring(filename); diff --git a/src/common/sysopt.cpp b/src/common/sysopt.cpp index 56227995c9..d27f46c726 100644 --- a/src/common/sysopt.cpp +++ b/src/common/sysopt.cpp @@ -100,7 +100,12 @@ wxString wxSystemOptions::GetOption(const wxString& name) int wxSystemOptions::GetOptionInt(const wxString& name) { - return wxAtoi(GetOption(name)); +#ifdef _PACC_VER + // work around the PalmOS pacc compiler bug + return wxAtoi (GetOption(name).data()); +#else + return wxAtoi (GetOption(name)); +#endif } bool wxSystemOptions::HasOption(const wxString& name)