avoid undefined behavior from token paste resulting in more than one token

[wxWidgets.git] / src / palmos / utils.cpp

diff --git a/src/palmos/utils.cpp b/src/palmos/utils.cpp
index f1f40adad7774ad0f40a9fed7d76265463f415d9..f63cfb67ee3b972c8aad0425ba30c51ac72985e4 100644 (file)
--- a/src/palmos/utils.cpp
+++ b/src/palmos/utils.cpp
@@ -90,7 +90,7 @@ bool wxGetUserName(wxChar *buf, int maxSize)
         return false;
     }
 
-    wxStrncpy (buf, wxConvertMB2WX(id), maxSize - 1);
+    wxStrncpy (buf, wxSafeConvertMB2WX(id), maxSize - 1);
 
     // free the buffer
     MemPtrUnlock(id);
@@ -103,9 +103,9 @@ const wxChar* wxGetHomeDir(wxString *pstr)
     return NULL;
 }
 
-wxChar *wxGetUserHome(const wxString& WXUNUSED(user))
+wxString wxGetUserHome(const wxString& WXUNUSED(user))
 {
-    return NULL;
+    return wxString();
 }
 
 bool wxGetDiskSpace(const wxString& path, wxDiskspaceSize_t *pTotal, wxDiskspaceSize_t *pFree)
@@ -122,10 +122,17 @@ bool wxGetEnv(const wxString& var, wxString *value)
     return false;
 }
 
+#if ! WXWIN_COMPATIBILITY_2_8
 bool wxSetEnv(const wxString& var, const wxChar *value)
 {
     return false;
 }
+#endif // ! WXWIN_COMPATIBILITY_2_8
+
+bool wxUnsetEnv(const wxString& var)
+{
+    return false;
+}
 
 // ----------------------------------------------------------------------------
 // process management
@@ -197,6 +204,11 @@ void wxBell()
     SndPlaySystemSound(sndWarning);
 }
 
+bool wxIsPlatform64Bit()
+{
+    return false;
+}
+
 wxString wxGetOsDescription()
 {
     wxString strOS = _T("PalmOS");