some minor fixes for DEC CXX compilation

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1730 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/gtk/checklst.h b/include/wx/gtk/checklst.h
index 7dc24e2716368e255320c5badef7312f224f7104..cbdd0ee2334c1d9a12234417c86376bb7c3f0243 100644 (file)
--- a/include/wx/gtk/checklst.h
+++ b/include/wx/gtk/checklst.h
@@ -41,11 +41,7 @@ public:
             const wxPoint& pos = wxDefaultPosition,
             const wxSize& size = wxDefaultSize,
             int nStrings = 0,
-#if defined(__SUNCC__)
-            const wxString choices[] = NULL,
-#else
-            const wxString choices[] = (const wxString *) NULL,
-#endif
+            const wxString *choices = (const wxString *)NULL,
             long style = 0,
             const wxValidator& validator = wxDefaultValidator,
             const wxString& name = wxListBoxNameStr);

diff --git a/include/wx/gtk1/checklst.h b/include/wx/gtk1/checklst.h
index 7dc24e2716368e255320c5badef7312f224f7104..cbdd0ee2334c1d9a12234417c86376bb7c3f0243 100644 (file)
--- a/include/wx/gtk1/checklst.h
+++ b/include/wx/gtk1/checklst.h
@@ -41,11 +41,7 @@ public:
             const wxPoint& pos = wxDefaultPosition,
             const wxSize& size = wxDefaultSize,
             int nStrings = 0,
-#if defined(__SUNCC__)
-            const wxString choices[] = NULL,
-#else
-            const wxString choices[] = (const wxString *) NULL,
-#endif
+            const wxString *choices = (const wxString *)NULL,
             long style = 0,
             const wxValidator& validator = wxDefaultValidator,
             const wxString& name = wxListBoxNameStr);

diff --git a/src/common/string.cpp b/src/common/string.cpp
index 06bb55f9c30953ff72033610af3b01f8f41adc0b..37a116fa020d4e9561cad08cbee96e751e4e46f2 100644 (file)
--- a/src/common/string.cpp
+++ b/src/common/string.cpp
@@ -116,6 +116,8 @@ extern const char WXDLLEXPORT *g_szNul = &g_strEmpty.dummy;
        // No warning
 #elif defined(__SUNCC__)
     // nothing -- I don't know about "#warning" for Sun's CC
+#elif defined(__DECCXX)
+   // nothing
 #else
     // change this to some analogue of '#warning' for your compiler
     #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 *strSecond = (wxString *)second;
 
-  if ( gs_compareFunction )
+  if ( gs_compareFunction ) {
     return gs_compareFunction(*strFirst, *strSecond);
+  }
   else {
     int result = strcmp(strFirst->c_str(), strSecond->c_str());
 

diff --git a/src/iodbc/dlproc.h b/src/iodbc/dlproc.h
index 34aeac6cd1bba1d250a4b9b7c2d17a5521cfb05c..56b463fda2c8bdf9bbee56570903026c7ba9b961 100644 (file)
--- a/src/iodbc/dlproc.h
+++ b/src/iodbc/dlproc.h
@@ -40,7 +40,7 @@ typedef void *HDLL;
 typedef shl_t HDLL;
 #endif
 
-#ifdef DLDAPI_AIX_LOAD
+#if defined(DLDAPI_AIX_LOAD) || defined(__DECCXX)
 typedef void *HDLL;
 #endif