From 7fff4f4d57ea6cd626bb56416a5778782de4cef3 Mon Sep 17 00:00:00 2001
From: florian <florian@freepascal.org>
Date: Sun, 12 Mar 2006 19:47:54 +0000
Subject: [PATCH] * pthreads fixed, still a mess

git-svn-id: trunk@2893 -
---
 packages/base/pthreads/pthreads.pp  | 16 +++--
 packages/base/pthreads/pthrsnos.inc |  5 +-
 rtl/solaris/ptypes.inc              | 97 +++++++++++++++++++++--------
 3 files changed, 86 insertions(+), 32 deletions(-)

diff --git a/packages/base/pthreads/pthreads.pp b/packages/base/pthreads/pthreads.pp
index 0c50385265..91aadcf474 100644
--- a/packages/base/pthreads/pthreads.pp
+++ b/packages/base/pthreads/pthreads.pp
@@ -21,15 +21,23 @@ interface
 {$PACKRECORDS C}
 
 {$ifdef BSD}
-
 Uses BaseUnix, unixtype;
-
 {$i pthrbsd.inc}
-
 {$else}
-uses unixtype;
 
+{$ifdef linux}
+uses unixtype;
 {$i pthrlinux.inc}
+{$else}
+
+{$ifdef sunos}
+uses
+  unixtype;
+{$i pthrsnos.inc}
+{$else}
+
+{$endif}
+{$endif}
 {$endif}
 
 implementation
diff --git a/packages/base/pthreads/pthrsnos.inc b/packages/base/pthreads/pthrsnos.inc
index aca1a06afa..06c9a6ea4f 100644
--- a/packages/base/pthreads/pthrsnos.inc
+++ b/packages/base/pthreads/pthrsnos.inc
@@ -8,7 +8,7 @@
 }
 
 const
-  External_library=''; {Setup as you need}
+  External_library='c'; {Setup as you need}
 
 
 Type
@@ -21,7 +21,10 @@ Ppthread_barrierattr_t  = ^pthread_barrierattr_t;
 Ppthread_cond_t  = ^pthread_cond_t;
 Ppthread_condattr_t  = ^pthread_condattr_t;
 Ppthread_key_t  = ^pthread_key_t;
+
 Ppthread_mutex_t  = ^pthread_mutex_t;
+TPthreadMutex = pthread_mutex_t;
+
 Ppthread_mutexattr_t  = ^pthread_mutexattr_t;
 Ppthread_once_t  = ^pthread_once_t;
 Ppthread_rwlock_t  = ^pthread_rwlock_t;
diff --git a/rtl/solaris/ptypes.inc b/rtl/solaris/ptypes.inc
index ed660aad0a..2a24fc3384 100644
--- a/rtl/solaris/ptypes.inc
+++ b/rtl/solaris/ptypes.inc
@@ -95,6 +95,37 @@ Type
     TTime     = time_t;
     pTime     = ^time_t;
     ptime_t   = ^time_t;
+    clockid_t = cint;
+    caddr_t   = ^char;
+
+    uint32_t = cuint32;
+    int32_t = cint32;
+    caddr32_t = uint32_t;
+    daddr32_t = int32_t;
+    off32_t = int32_t;
+    ino32_t = uint32_t;
+    blkcnt32_t = int32_t;
+    fsblkcnt32_t = uint32_t;
+    fsfilcnt32_t = uint32_t;
+    id32_t = int32_t;
+    major32_t = uint32_t;
+    minor32_t = uint32_t;
+    key32_t = int32_t;
+    mode32_t = uint32_t;
+    uid32_t = int32_t;
+    gid32_t = int32_t;
+    nlink32_t = uint32_t;
+    dev32_t = uint32_t;
+    pid32_t = int32_t;
+    size32_t = uint32_t;
+    ssize32_t = int32_t;
+    time32_t = int32_t;
+
+
+    upad64_t  = qword;
+    uintptr_t = ^cuint;
+    uint_t    = cuint;
+
 
     wchar_t   = widechar;
     pwchar_t  = ^wchar_t;
@@ -159,13 +190,29 @@ Type
   end;
 
   pthread_mutex_t = record
-    __m_reserved: cint;
-    __m_count: cint;
-    __m_owner: pointer;
-    __m_kind:  cint;
-    __m_lock: _pthread_fastlock;
+    __pthread_mutex_flags : record
+         __pthread_mutex_flag1 : word;
+         __pthread_mutex_flag2 : byte;
+         __pthread_mutex_ceiling : byte;
+         __pthread_mutex_type : word;
+         __pthread_mutex_magic : word;
+      end;
+    __pthread_mutex_lock : record
+        case longint of
+           0 : ( __pthread_mutex_lock64 : record
+                __pthread_mutex_pad : array[0..7] of byte;
+             end );
+           1 : ( __pthread_mutex_lock32 : record
+                __pthread_ownerpid : dword;
+                __pthread_lockword : dword;
+             end );
+           2 : ( __pthread_mutex_owner64 : qword );
+        end;
+    __pthread_mutex_data : qword;
   end;
 
+  pthread_spinlock_t = pthread_mutex_t;
+
   pthread_mutexattr_t = record
     __mutexkind: cint;
   end;
@@ -197,34 +244,30 @@ Type
     __pshared: cint;
   end;
 
+  _once = record
+     __pthread_once_pad : array[0..3] of upad64_t;
+  end;
+  pthread_once_t = _once;
+
+  pthread_barrier_t = record
+       __pthread_barrier_count : uint32_t;
+       __pthread_barrier_current : uint32_t;
+       __pthread_barrier_cycle : upad64_t;
+       __pthread_barrier_reserved : upad64_t;
+       __pthread_barrier_lock : pthread_mutex_t;
+       __pthread_barrier_cond : pthread_cond_t;
+    end;
+
+  pthread_barrierattr_t = record
+       __pthread_barrierattrp : pointer;
+    end;
+
   sem_t = record
      __sem_lock: _pthread_fastlock;
      __sem_value: cint;
      __sem_waiting: pointer;
   end;
 
-  uint32_t = cuint32;
-  int32_t = cint32;
-  caddr32_t = uint32_t;
-  daddr32_t = int32_t;
-  off32_t = int32_t;
-  ino32_t = uint32_t;
-  blkcnt32_t = int32_t;
-  fsblkcnt32_t = uint32_t;
-  fsfilcnt32_t = uint32_t;
-  id32_t = int32_t;
-  major32_t = uint32_t;
-  minor32_t = uint32_t;
-  key32_t = int32_t;
-  mode32_t = uint32_t;
-  uid32_t = int32_t;
-  gid32_t = int32_t;
-  nlink32_t = uint32_t;
-  dev32_t = uint32_t;
-  pid32_t = int32_t;
-  size32_t = uint32_t;
-  ssize32_t = int32_t;
-  time32_t = int32_t;
 
   clock32_t = int32_t;
   timeval32 = record