X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/974e8d946f30af2bd79b9029d1d2fb9e0d5b2dd4..61f0d452ea7e47fea18d0ab748095dc42d7dd66d:/src/common/utilscmn.cpp diff --git a/src/common/utilscmn.cpp b/src/common/utilscmn.cpp index 2491395090..bab380b7a8 100644 --- a/src/common/utilscmn.cpp +++ b/src/common/utilscmn.cpp @@ -130,7 +130,7 @@ int strncasecmp(const char *str_1, const char *str_2, size_t maxchar) } #endif // wxMAC -#ifdef __VMS__ +#if defined( __VMS__ ) && ( __VMS_VER < 70000000 ) // we have no strI functions under VMS, therefore I have implemented // an inefficient but portable version: convert copies of strings to lowercase // and then use the normal comparison @@ -151,7 +151,7 @@ int strcasecmp(const char *str_1, const char *str_2) myLowerString(temp1); myLowerString(temp2); - int result = strcmp(temp1,temp2); + int result = wxStrcmp(temp1,temp2); delete[] temp1; delete[] temp2; @@ -525,7 +525,7 @@ wxAcceleratorEntry *wxGetAccelFromString(const wxString& label) } } - return NULL; + return (wxAcceleratorEntry *)NULL; } #endif // wxUSE_ACCEL