Tue May 19 12:00:30 CDT 2009 Pekka Pessi <first.last@nokia.com>

  * su_uniqueid.c: Solaris misdefines PTHREAD_ONCE_INIT
  Ignore-this: 9fe2247164d572901ed4a30b009353db

  Solaris defines pthread_once_t as a struct containing an array. The
  initializer PTHREAD_ONCE_INIT needs two levels of brackets it but only has
  one. Original patch from Mike Jerris <mike@jerris.com>.

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@13387 d0543943-73ff-0310-b7d9-9358b9ac24b2

diff --git a/libs/sofia-sip/.update b/libs/sofia-sip/.update
index ecefa7fd5d589e68e9f8164c567d4905a3566ac9..902eb06483acc788ce06320b4923a28f7b93d998 100644 (file)
--- a/libs/sofia-sip/.update
+++ b/libs/sofia-sip/.update
@@ -1 +1 @@
-Tue May 19 09:46:18 CDT 2009
+Tue May 19 12:23:01 CDT 2009

diff --git a/libs/sofia-sip/libsofia-sip-ua/su/su_uniqueid.c b/libs/sofia-sip/libsofia-sip-ua/su/su_uniqueid.c
index ed278f312182794bcbc9b3be8ff8d553adeee69c..f27f87beb54fb2399fdde77e5949da8cae446ff3 100644 (file)
--- a/libs/sofia-sip/libsofia-sip-ua/su/su_uniqueid.c
+++ b/libs/sofia-sip/libsofia-sip-ua/su/su_uniqueid.c
@@ -84,11 +84,12 @@ union state {
 
 #include <pthread.h>
 
-#if defined(__sun)
-static pthread_once_t once = { PTHREAD_ONCE_INIT };
-#else
-static pthread_once_t once = PTHREAD_ONCE_INIT;
+#if __sun
+#undef PTHREAD_ONCE_INIT
+#define PTHREAD_ONCE_INIT {{ 0, 0, 0, PTHREAD_ONCE_NOTDONE }}
 #endif
+
+static pthread_once_t once = PTHREAD_ONCE_INIT;
 static int done_once = 1;
 static pthread_key_t state_key;