Committing in .

[wxWidgets.git] / src / common / utilscmn.cpp

diff --git a/src/common/utilscmn.cpp b/src/common/utilscmn.cpp
index 2491395090c8759d889366b53433aee68fe3dbdc..bab380b7a80fd32ed5d02c5e358daf8630cd1ac2 100644 (file)
--- 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