warnings/linking fixes for wxMotif

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

diff --git a/include/wx/spinbutt.h b/include/wx/spinbutt.h
index d1e04f8104ac4d0407fd0754e1c60e2534124652..5b963300169d4a9a6b3e76638d70500ea7b93fce 100644 (file)
--- a/include/wx/spinbutt.h
+++ b/include/wx/spinbutt.h
@@ -13,7 +13,9 @@
 #define _WX_SPINBUTT_H_BASE_
 
 #ifdef __GNUG__
-    #pragma interface "spinbutbase.h"
+    #ifndef __WXMOTIF__ // because there is no matching .cpp for Motif
+        #pragma interface "spinbutbase.h"
+    #endif // Motif
 #endif
 
 // ----------------------------------------------------------------------------

diff --git a/src/unix/threadpsx.cpp b/src/unix/threadpsx.cpp
index 5bbb54a77826457f2ea1dc0bfbd0491a617e2add..b30021a122799480fbd6f9a00ca2dc77d2662cee 100644 (file)
--- a/src/unix/threadpsx.cpp
+++ b/src/unix/threadpsx.cpp
@@ -135,7 +135,7 @@ static pthread_key_t gs_keySelf;
 static size_t gs_nThreadsBeingDeleted = 0;
 
 // a mutex to protect gs_nThreadsBeingDeleted
-static pthread_mutex_t gs_mutexDeleteThread = PTHREAD_MUTEX_INITIALIZER;
+static pthread_mutex_t gs_mutexDeleteThread;
 
 // and a condition variable which will be signaled when all
 // gs_nThreadsBeingDeleted will have been deleted
@@ -1449,6 +1449,10 @@ bool wxThreadModule::OnInit()
     gs_mutexGui->Lock();
 #endif // wxUSE_GUI
 
+    // under Solaris we get a warning from CC when using
+    // PTHREAD_MUTEX_INITIALIZER, so do it dynamically
+    pthread_mutex_init(&gs_mutexDeleteThread, NULL);
+
     return TRUE;
 }