--- Merging r15297 into '.':

U    rtl/haiku/errno.inc
--- Merging r15404 into '.':
U    rtl/bsd/sysosh.inc
U    rtl/freebsd/ptypes.inc
--- Merging r15405 into '.':
G    rtl/freebsd/ptypes.inc
--- Merging r15419 into '.':
U    rtl/unix/cwstring.pp
--- Merging r15452 into '.':
U    rtl/inc/fexpand.inc
--- Merging r15454 into '.':
U    rtl/unix/sysunixh.inc
--- Merging r15456 into '.':
U    tests/test/units/dos/tfexpand.pp
--- Merging r15464 into '.':
U    packages/openssl/src/openssl.pas
--- Merging r15469 into '.':
G    packages/openssl/src/openssl.pas
--- Merging r15485 into '.':
U    packages/graph/src/inc/modes.inc

# revisions: 15297,15404,15405,15419,15452,15454,15456,15464,15469,15485
------------------------------------------------------------------------
r15297 | olivier | 2010-05-20 00:25:59 +0200 (Thu, 20 May 2010) | 2 lines
Changed paths:
   M /trunk/rtl/haiku/errno.inc

* Define two more constants in order to compile fppkg under Haiku after r152751

------------------------------------------------------------------------
------------------------------------------------------------------------
r15404 | marco | 2010-06-10 22:22:22 +0200 (Thu, 10 Jun 2010) | 3 lines
Changed paths:
   M /trunk/rtl/bsd/sysosh.inc
   M /trunk/rtl/freebsd/ptypes.inc

 * start exchanging untyped "Pointer" handle types to pointer to empty records.
    see discussion mantis 16607

------------------------------------------------------------------------
------------------------------------------------------------------------
r15405 | marco | 2010-06-10 22:28:39 +0200 (Thu, 10 Jun 2010) | 3 lines
Changed paths:
   M /trunk/rtl/freebsd/ptypes.inc

  *  continue exchanging untyped "Pointer" handle types to pointer to empty records.
    see discussion mantis 16607. 

------------------------------------------------------------------------
------------------------------------------------------------------------
r15419 | jonas | 2010-06-13 13:44:33 +0200 (Sun, 13 Jun 2010) | 2 lines
Changed paths:
   M /trunk/rtl/unix/cwstring.pp

  * de-tabbed

------------------------------------------------------------------------
------------------------------------------------------------------------
r15452 | hajny | 2010-06-19 18:15:40 +0200 (Sat, 19 Jun 2010) | 1 line
Changed paths:
   M /trunk/rtl/inc/fexpand.inc

  * fix for web bug #16651
------------------------------------------------------------------------
------------------------------------------------------------------------
r15454 | hajny | 2010-06-19 18:22:10 +0200 (Sat, 19 Jun 2010) | 1 line
Changed paths:
   M /trunk/rtl/unix/sysunixh.inc

  * do not use / as DriveSeparator
------------------------------------------------------------------------
------------------------------------------------------------------------
r15456 | hajny | 2010-06-19 18:27:03 +0200 (Sat, 19 Jun 2010) | 1 line
Changed paths:
   M /trunk/tests/test/units/dos/tfexpand.pp

  * add test for web bug #16651
------------------------------------------------------------------------
------------------------------------------------------------------------
r15464 | sekelsenmat | 2010-06-21 16:17:35 +0200 (Mon, 21 Jun 2010) | 1 line
Changed paths:
   M /trunk/packages/openssl/src/openssl.pas

Adds new RSA, RAND, EVP, X509, Crypto and ERR functions to OpenSSL and also adds a mechanism to show which functions weren't loaded.
------------------------------------------------------------------------
------------------------------------------------------------------------
r15469 | sekelsenmat | 2010-06-21 23:17:30 +0200 (Mon, 21 Jun 2010) | 1 line
Changed paths:
   M /trunk/packages/openssl/src/openssl.pas

Patch from Inoussa OUEDRAOGO, improves OpenSSL
------------------------------------------------------------------------
------------------------------------------------------------------------
r15485 | jonas | 2010-06-27 14:38:30 +0200 (Sun, 27 Jun 2010) | 3 lines
Changed paths:
   M /trunk/packages/graph/src/inc/modes.inc

  * properly initialise graphresult when setgraphmode is called directly
    (patch by Nikolay Nikolov, mantis #16798)

------------------------------------------------------------------------

git-svn-id: branches/fixes_2_4@16376 -

packages/graph/src/inc/modes.inc

@@ -549,6 +549,7 @@ end;
           _GraphResult := grInvalidMode;
           exit;
         end;
+      _GraphResult := grOk;
       modeinfo^.InitMode;
       if _GraphResult <> grOk then
         begin

rtl/bsd/sysosh.inc

@@ -19,7 +19,8 @@
 type
   { fd are int in C also for 64bit targets (x86_64) }
   THandle = Longint;
-  TThreadID = pointer;
+  TThreadRec = record end;
+  TThreadID  = ^TThreadRec;
   
   { pthread_mutex_t }
   PRTLCriticalSection = ^TRTLCriticalSection;

rtl/freebsd/ptypes.inc

@@ -117,17 +117,27 @@ type
   ptimespec= ^timespec;
   Ttimespec= timespec;
 
-   pthread_t            = pointer;
-   pthread_attr_t       = pointer;
+   pthread_t_rec        = record end;
+   pthread_attr_t_rec   = record end;
+//   pthread_mutex_t_rec   = record end;
+   pthread_mutexattr_t_rec   = record end;
+   pthread_cond_t_rec   = record end;
+   pthread_condattr_t_rec   = record end;
+   pthread_rwlock_t_rec   = record end;
+   pthread_rwlockattr_t_rec   = record end;
+
+   pthread_t            = ^pthread_t_rec;
+   pthread_attr_t       = ^pthread_attr_t_rec;
    pthread_mutex_t      = {$i pmutext.inc}
-   pthread_mutexattr_t  = pointer;
-   pthread_cond_t       = pointer;
-   pthread_condattr_t   = pointer;
+   pthread_mutexattr_t  = ^pthread_mutexattr_t_rec;
+   pthread_cond_t       = ^pthread_cond_t_rec;
+   pthread_condattr_t   = ^pthread_condattr_t_rec;
    pthread_key_t        = cint;
-   pthread_rwlock_t     = pointer;
-   pthread_rwlockattr_t = pointer;
+   pthread_rwlock_t     = ^pthread_rwlock_t_rec;
+   pthread_rwlockattr_t = ^pthread_rwlock_t_rec;
 
-   sem_t                = pointer;
+   sem_t_rec		= record end;
+   sem_t                = ^sem_t_rec;
    rlim_t		= int64;
    TRlim		= rlim_t;
   {

rtl/haiku/errno.inc

@@ -2,7 +2,7 @@
     This file is part of the Free Pascal run time library.
     Copyright (c) 1999-2000 by the Free Pascal development team.
 
-    BeOS POSIX compliant error codes
+    Haiku POSIX compliant error codes
 
     See the file COPYING.FPC, included in this distribution,
     for details about the copyright.
@@ -386,10 +386,11 @@ const
     ESysESRCH       = (B_POSIX_ERROR_BASE + 13);
     ESysETIMEDOUT   = ord(B_TIMED_OUT);
     ESysEXDEV       = ord(B_CROSS_DEVICE_LINK);
+    ESysEMSGSIZE     = EMSGSIZE;
+    ESysEOPNOTSUPP   = EOPNOTSUPP;
 
     {ESysEBADMSG     =    realtime extension POSIX only   }
     {ESysECANCELED   =    async. I/O extension POSIX only }
-    {ESysEMSGSIZE    =    realtime extension POSIX only   }
     {ESysEINPROGRESS =    async. I/O extension POSIX only }
 
 {***********************************************************************}

rtl/inc/fexpand.inc

@@ -177,7 +177,7 @@ begin
     if PathStart > 1 then
 {$ELSE FPC_FEXPAND_VOLUMES}
     if (Length (Pa) > 1) and (Pa [1] in ['A'..'Z', 'a'..'z']) and
-                                                 (Pa [2] = DriveSeparator) then
+      (Pa [2] = DriveSeparator) and (DriveSeparator <> DirectorySeparator) then
 {$ENDIF FPC_FEXPAND_VOLUMES}
         begin
 

rtl/unix/cwstring.pp

@@ -191,7 +191,7 @@ procedure Wide2AnsiMove(source:pwidechar;var dest:ansistring;len:SizeInt);
     if PtrInt(iconv_wide2ansi)=-1 then
       begin
         DefaultUnicode2AnsiMove(source,dest,len);
-	exit;
+        exit;
       end;
 {$endif VER2_2}
     mynil:=nil;
@@ -257,7 +257,7 @@ procedure Ansi2WideMove(source:pchar;var dest:widestring;len:SizeInt);
     if PtrInt(iconv_ansi2wide)=-1 then
       begin
         DefaultAnsi2UnicodeMove(source,dest,len);
-	exit;
+        exit;
       end;
 {$endif VER2_2}
     mynil:=nil;

rtl/unix/sysunixh.inc

@@ -28,7 +28,7 @@ const
  LineEnding = #10;
  LFNSupport = true;
  DirectorySeparator = '/';
- DriveSeparator = '/';
+ DriveSeparator = '';
  ExtensionSeparator = '.';
  PathSeparator = ':';
  AllowDirectorySeparators : set of char = ['\','/'];

tests/test/units/dos/tfexpand.pp

@@ -100,6 +100,7 @@ const
   {$ELSE MACOS}
    {$IFDEF UNIX}
  DirectorySeparator = '/';
+ DriveSeparator = '/';
  FileNameCaseSensitive = true;
    {$ELSE UNIX}
     {$IFDEF AMIGA}
@@ -150,12 +151,14 @@ begin
   for I := 1 to Length (S) do
    if S [I] = DirectorySeparator2 then
     S [I] := DirectorySeparator;
+{$IFNDEF FPC_FEXPAND_DRIVES}
  if DriveSeparator = DirectorySeparator then
-  begin
-   I := Pos (DirectorySeparator + DirectorySeparator, S);
-   if I <> 0 then
-    Delete (S, I, 1);
-  end;
+  I := Pos (DirectorySeparator + DirectorySeparator, S)
+ else
+  I := Pos (DriveSeparator, S);
+ if I <> 0 then
+  Delete (S, 1, I);
+{$ENDIF FPC_FEXPAND_DRIVES}
 end;
 
 procedure GetDir (Drive: byte; var Directory: string);
@@ -202,6 +205,13 @@ begin
 {$ENDIF DEBUG}
  Rslt := Translate (Rslt);
  Rslt2 := FExpand (Src);
+{$IFDEF DIRECT}
+ {$IFNDEF FPC_FEXPAND_DRIVES}
+ I := Pos (System.DriveSeparator, Rslt2);
+ if I <> 0 then
+  Delete (Rslt2, 1, I);
+ {$ENDIF FPC_FEXPAND_DRIVES}
+{$ENDIF DIRECT}
 {$IFNDEF UNIX}
  if (Length (Rslt2) > 1) and (Rslt2 [1] in ['a'..'z']) and (Rslt2[2]=DriveSep) then
    Rslt2 [1] := UpCase (Rslt2 [1]);
@@ -253,6 +263,11 @@ begin
  TestDir0 := TestDir;
 {$IFDEF DIRECT}
  XToDirect (TestDir);
+ {$IFNDEF FPC_FEXPAND_DRIVES}
+ I := Pos (System.DriveSeparator, TestDir);
+ if I <> 0 then
+  Delete (TestDir, 1, I);
+ {$ENDIF FPC_FEXPAND_DRIVES}
 {$ENDIF DIRECT}
  Assign (F, TestFileName);
  Rewrite (F);
@@ -263,6 +278,13 @@ begin
 {$ENDIF DIRECT}
 {$I+}
  GetDir (0, CurDir);
+{$IFDEF DIRECT}
+ {$IFNDEF FPC_FEXPAND_DRIVES}
+ I := Pos (System.DriveSeparator, CurDir);
+ if I <> 0 then
+  Delete (CurDir, 1, I);
+ {$ENDIF FPC_FEXPAND_DRIVES}
+{$ENDIF DIRECT}
 {$IFNDEF NODRIVEC}
  GetDir (3, CDir);
 {$ENDIF NODRIVEC}
@@ -326,6 +348,7 @@ if CDir [Length (CDir)] = DirSep then Check ('c:anything', CDir + 'anything')
  Check ('.' + DirSep + 'd', CurDir + DirSep + 'd');
  {$ENDIF NODOTS}
 {$ENDIF MACOS}
+ Check ('d' + DirSep + TestFileName, CurDir + DirSep + 'd' + DirSep + TestFileName);
  Check (' d', CurDir + DirSep + ' d');
  Check ('dd', CurDir + DirSep + 'dd');
 {$IFDEF MACOS}