--- /usr/include/sys/pthread.h	2009-01-11 16:20:03 -0700
+++ /comptel/ilink/src//pthread.h	2010-03-31 06:58:51 -0600
@@ -131,55 +131,54 @@
 #define __LWP_MTX_VALID          	2368
 
 #define __SPNLCK_INITIALIZER						\
-	1, 1, 1, 1,                        				\
+	{1, 1, 1, 1},                        				\
 	__POINTER_SET,							\
-        1,              						\
-        0
+        {1, 0}
 
-#define PTHREAD_MUTEX_INITIALIZER  {					\
-	__PTHREAD_MUTEX_VALID, 0,					\
-	(PTHREAD_MUTEX_DEFAULT | PTHREAD_PROCESS_PRIVATE),		\
-	__SPNLCK_INITIALIZER,						\
-	0, 0, -1, 0,							\
-	0, __LWP_MTX_VALID, 0, 1, 1, 1, 1,				\
-	0, 0								\
+#define PTHREAD_MUTEX_INITIALIZER {                                     \
+        {__PTHREAD_MUTEX_VALID, 0},                                     \
+        (PTHREAD_MUTEX_DEFAULT | PTHREAD_PROCESS_PRIVATE),              \
+	__SPNLCK_INITIALIZER,						\
+        {0, 0, -1, 0},                                                  \
+        {0, __LWP_MTX_VALID}, {0, 1, 1, 1, 1},                          \
+        {0, 0}                                                          \
 }
 
 #define PTHREAD_MUTEX_NORMAL_INITIALIZER_NP  {				\
-	__PTHREAD_MUTEX_VALID, 0,					\
+	{__PTHREAD_MUTEX_VALID, 0},					\
 	(PTHREAD_MUTEX_NORMAL | PTHREAD_PROCESS_PRIVATE),		\
 	__SPNLCK_INITIALIZER,						\
-	0, 0, -1, 0,							\
-	0, __LWP_MTX_VALID, 0, 1, 1, 1, 1,				\
-	0, 0								\
+	{0, 0, -1, 0},							\
+	{0, __LWP_MTX_VALID}, {0, 1, 1, 1, 1},				\
+	{0, 0}								\
 }
 
 #define PTHREAD_MUTEX_NO_OWNER_INITIALIZER_NP  { 			\
-        __PTHREAD_MUTEX_VALID, 0,                                       \
+        {__PTHREAD_MUTEX_VALID, 0},                                     \
         (PTHREAD_MUTEX_NO_OWNER_NP | PTHREAD_PROCESS_PRIVATE),          \
         __SPNLCK_INITIALIZER,                                           \
-        0, 0, -1, 0,                                                    \
-        0, __LWP_MTX_VALID, 0, 1, 1, 1, 1,                              \
-        0, 0                                                            \
+        {0, 0, -1, 0},                                                  \
+        {0, __LWP_MTX_VALID}, {0, 1, 1, 1, 1},                          \
+        {0, 0}                                                          \
 }
 
 
 #define PTHREAD_MUTEX_RECURSIVE_INITIALIZER_NP  {			\
-	__PTHREAD_MUTEX_VALID, 0,					\
+	{__PTHREAD_MUTEX_VALID, 0},					\
 	(PTHREAD_MUTEX_RECURSIVE | PTHREAD_PROCESS_PRIVATE),		\
 	__SPNLCK_INITIALIZER,						\
-	0, 0, -1, 0,							\
-	0, __LWP_MTX_VALID, 0, 1, 1, 1, 1,				\
-	0, 0								\
+	{0, 0, -1, 0},							\
+	{0, __LWP_MTX_VALID}, {0, 1, 1, 1, 1},				\
+	{0, 0}								\
 }
 
 #define PTHREAD_MUTEX_ERRORCHECK_INITIALIZER_NP  {			\
-	__PTHREAD_MUTEX_VALID, 0,					\
+	{__PTHREAD_MUTEX_VALID, 0},					\
 	(PTHREAD_MUTEX_ERRORCHECK | PTHREAD_PROCESS_PRIVATE),		\
 	__SPNLCK_INITIALIZER,						\
-	0, 0, -1, 0,							\
-	0, __LWP_MTX_VALID, 0, 1, 1, 1, 1,				\
-	0, 0								\
+	{0, 0, -1, 0},							\
+	{0, __LWP_MTX_VALID}, {0, 1, 1, 1, 1},				\
+	{0, 0}								\
 }
 
 
@@ -191,22 +190,22 @@
 #define __LWP_COND_VALID         	5467
 
 #define PTHREAD_COND_INITIALIZER  {					\
-	__PTHREAD_COND_VALID, 0,					\
+	{__PTHREAD_COND_VALID, 0},					\
 	PTHREAD_PROCESS_PRIVATE,					\
 	__SPNLCK_INITIALIZER,						\
-	__LWP_COND_VALID, 0,						\
-	0, 0								\
+	{__LWP_COND_VALID, 0},						\
+	{0, 0}								\
 }
 
 #define __PTHREAD_RWLOCK_VALID		0x8c
 #define __LWP_RWLOCK_VALID          	0x8c91
 
 #define PTHREAD_RWLOCK_INITIALIZER  {					\
-	__PTHREAD_RWLOCK_VALID, 0,					\
+	{__PTHREAD_RWLOCK_VALID, 0},					\
 	PTHREAD_PROCESS_PRIVATE, 					\
 	__SPNLCK_INITIALIZER,						\
-	__LWP_RWLOCK_VALID, 0,						\
-	0, 0, 0, 0, 0, 0, 0 						\
+	{__LWP_RWLOCK_VALID, 0},					\
+	{0, 0, 0, 0, 0}, {0, 0}						\
 }
 
 
