diff --git a/include/wx/db.h b/include/wx/db.h
index 070fdce330..7fba228c9a 100644
--- a/include/wx/db.h
+++ b/include/wx/db.h
@@ -589,7 +589,13 @@ public:
     // ODBC Error Inf.
     SWORD  cbErrorMsg;
     int    DB_STATUS;
+#ifdef __VMS
+   // The DECC compiler chokes when in db.cpp the array is accessed outside
+   // its bounds. Maybe this change should also applied for other platforms.
+    wxChar errorList[DB_MAX_ERROR_HISTORY][DB_MAX_ERROR_MSG_LEN+1];
+#else
     wxChar errorList[DB_MAX_ERROR_HISTORY][DB_MAX_ERROR_MSG_LEN];
+#endif
     wxChar errorMsg[SQL_MAX_MESSAGE_LENGTH];
     SDWORD nativeError;
     wxChar sqlState[20];
diff --git a/setup.h_vms b/setup.h_vms
index 6147c8a70b..579a231d7c 100644
--- a/setup.h_vms
+++ b/setup.h_vms
@@ -1060,6 +1060,9 @@
 /* The type of 3rd argument to getsockname() - usually size_t or int */
 #define SOCKLEN_T size_t
 
+/* The type of 5th argument to getsockopt() - usually size_t or int */
+#define SOCKOPTLEN_T size_t
+
 /* The type of statvfs(2) argument */
 #undef WX_STATFS_T