From: Jouk Jansen Date: Wed, 12 Jan 2005 07:47:40 +0000 (+0000) Subject: Committing in . X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/13973396cb244918489fbc14f6112549c4687881 Committing in . Updates for OpenVMS Modified Files: wxWidgets/setup.h_vms wxWidgets/include/wx/db.h ---------------------------------------------------------------------- git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@31321 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- 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