--- Merging r20657 into '.':

U    rtl/solaris/pthread.inc
--- Merging r20658 into '.':
U    rtl/solaris/ptypes.inc
--- Merging r21231 into '.':
U    rtl/solaris/termiosproc.inc

# revisions: 20657,20658,21231
r20657 | jonas | 2012-03-29 22:32:20 +0200 (Thu, 29 Mar 2012) | 3 lines
Changed paths:
   M /trunk/rtl/solaris/pthread.inc

  * fixed parameter types of pthread_mutex_destroy, pthread_mutex_lock and
    pthread_mutex_unlock (ppthread_mutexattr_t -> ppthread_mutex_t)
r20658 | jonas | 2012-03-29 22:32:42 +0200 (Thu, 29 Mar 2012) | 2 lines
Changed paths:
   M /trunk/rtl/solaris/ptypes.inc

  * removed "packed" from a few OS interface records
r21231 | marco | 2012-05-05 16:48:49 +0200 (Sat, 05 May 2012) | 4 lines
Changed paths:
   M /trunk/rtl/solaris/termiosproc.inc

 * Applied patch from Ludo Brands wrt constant used in termio.TCFlush.
   Mantis #21665, but that remains open because it must be investigated
   for other oses too.

git-svn-id: branches/fixes_2_6@22546 -

rtl/solaris/pthread.inc

@@ -90,10 +90,10 @@ function  pthread_create ( p: ppthread_t;attr : ppthread_attr_t;f:__startroutine
 procedure pthread_exit  ( p: pointer); cdecl;external 'c';
 function  pthread_self:pthread_t; cdecl;external 'c';
 function  pthread_mutex_init (p:ppthread_mutex_t;o:ppthread_mutexattr_t):cint; cdecl;external 'c';
-function  pthread_mutex_destroy (p:ppthread_mutexattr_t):cint; cdecl;external 'c';
-function  pthread_mutex_lock    (p:ppthread_mutexattr_t):cint; cdecl;external 'c';
+function  pthread_mutex_destroy (p:ppthread_mutex_t):cint; cdecl;external 'c';
+function  pthread_mutex_lock    (p:ppthread_mutex_t):cint; cdecl;external 'c';
 function  pthread_mutex_trylock (p:ppthread_mutex_t):cint; cdecl;external 'c';
-function  pthread_mutex_unlock  (p:ppthread_mutexattr_t):cint; cdecl;external 'c';
+function  pthread_mutex_unlock  (p:ppthread_mutex_t):cint; cdecl;external 'c';
 function  pthread_cancel(_para1:pthread_t):cint;cdecl;external 'c';
 function  pthread_detach(_para1:pthread_t):cint;cdecl;external 'c';
 function  pthread_join(_para1:pthread_t; _para2:Ppointer):cint;cdecl;external 'c';

rtl/solaris/ptypes.inc

@@ -145,14 +145,14 @@ Type
     TSockLen = socklen_t;
     pSockLen = ^socklen_t;
 
-  timeval     = packed record
+  timeval     = record
                  tv_sec,
                  tv_usec:clong;
                 end;
   ptimeval    = ^timeval;
   TTimeVal    = timeval;
 
-  timespec    = packed record
+  timespec    = record
                  tv_sec   : time_t;
                  tv_nsec  : clong;
                 end;

rtl/solaris/termiosproc.inc

@@ -79,7 +79,7 @@ end;
 
 Function TCFlush(fd,qsel:cint):cint; {$ifdef VER2_0}inline;{$endif}
 begin
-  TCFlush:=fpIOCtl(fd,TIOCFLUSH,pointer(qsel));
+  TCFlush:=fpIOCtl(fd,TCFLSH,pointer(qsel));
 end;
 
 Function IsATTY (Handle:cint):cint;