Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

some minor fixes for DEC CXX compilation

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1730 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
1999-02-19 17:32:03 +00:00
parent ebefb2f345
commit 64716cd79d
4 changed files with 7 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/wx/gtk/checklst.h
View File

@@ -41,11 +41,7 @@ public:
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
int nStrings = 0, int nStrings = 0,
#if defined(__SUNCC__) const wxString *choices = (const wxString *)NULL,
const wxString choices[] = NULL,
#else
const wxString choices[] = (const wxString *) NULL,
#endif
long style = 0, long style = 0,
const wxValidator& validator = wxDefaultValidator, const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxListBoxNameStr); const wxString& name = wxListBoxNameStr);

6
include/wx/gtk1/checklst.h
View File

@@ -41,11 +41,7 @@ public:
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
int nStrings = 0, int nStrings = 0,
#if defined(__SUNCC__) const wxString *choices = (const wxString *)NULL,
const wxString choices[] = NULL,
#else
const wxString choices[] = (const wxString *) NULL,
#endif
long style = 0, long style = 0,
const wxValidator& validator = wxDefaultValidator, const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxListBoxNameStr); const wxString& name = wxListBoxNameStr);

5
src/common/string.cpp
View File

@@ -116,6 +116,8 @@ extern const char WXDLLEXPORT *g_szNul = &g_strEmpty.dummy;
// No warning // No warning
#elif defined(__SUNCC__) #elif defined(__SUNCC__)
// nothing -- I don't know about "#warning" for Sun's CC // nothing -- I don't know about "#warning" for Sun's CC
#elif defined(__DECCXX)
// nothing
#else #else
// change this to some analogue of '#warning' for your compiler // change this to some analogue of '#warning' for your compiler
#error "Using sprintf() because no snprintf()-like function defined" #error "Using sprintf() because no snprintf()-like function defined"
@@ -1483,8 +1485,9 @@ static int wxStringCompareFunction(const void *first, const void *second)
wxString *strFirst = (wxString *)first; wxString *strFirst = (wxString *)first;
wxString *strSecond = (wxString *)second; wxString *strSecond = (wxString *)second;
if ( gs_compareFunction ) if ( gs_compareFunction ) {
return gs_compareFunction(*strFirst, *strSecond); return gs_compareFunction(*strFirst, *strSecond);
}
else { else {
int result = strcmp(strFirst->c_str(), strSecond->c_str()); int result = strcmp(strFirst->c_str(), strSecond->c_str());

2
src/iodbc/dlproc.h
View File

@@ -40,7 +40,7 @@ typedef void *HDLL;
typedef shl_t HDLL; typedef shl_t HDLL;
#endif #endif
#ifdef DLDAPI_AIX_LOAD #if defined(DLDAPI_AIX_LOAD) || defined(__DECCXX)
typedef void *HDLL; typedef void *HDLL;
#endif #endif