STABLE14-solaris-mypid-track-threads-20070104

based on suggestion by tkeiser

(cherry picked from commit 267b548a488c5d666582dd050a253c1652872a4d)

diff --git a/src/afs/lock.h b/src/afs/lock.h
index 80e3b79233b7cf9fc1f043e1dd639935ebc0bbf9..e3a36ccf0047cb3dd3269035c5a099db5875833d 100644 (file)
--- a/src/afs/lock.h
+++ b/src/afs/lock.h
@@ -86,7 +86,10 @@ typedef struct afs_bozoLock afs_bozoLock_t;
 #define BEGINMAC do {
 #define ENDMAC   } while (0)
 
-#if defined(AFS_SUN5_ENV) || defined(AFS_OBSD_ENV)
+#if defined(AFS_SUN57_ENV) 
+#define MyPidxx (curthread->t_tid)
+#else
+#if defined(AFS_OBSD_ENV) || defined(AFS_SUN5_ENV)
 #define MyPidxx (curproc->p_pid)
 #else
 #if defined(AFS_AIX41_ENV)
@@ -124,6 +127,7 @@ extern tid_t thread_self();
 #endif /* AFS_HPUX101_ENV */
 #endif /* AFS_AIX41_ENV */
 #endif
+#endif
 
 /* all locks wait on excl_locked except for READ_LOCK, which waits on readers_reading */
 struct afs_lock {