瀏覽代碼

* libc patches from Almindor

git-svn-id: trunk@1163 -
marco 20 年之前
父節點
當前提交
20087744ea
共有 3 個文件被更改,包括 14 次插入12 次删除
  1. 6 6
      packages/base/libc/crypth.inc
  2. 6 6
      packages/base/libc/dlfcnh.inc
  3. 2 0
      packages/base/libc/libc.pp

+ 6 - 6
packages/base/libc/crypth.inc

@@ -1,9 +1,9 @@
 
 
 { defined earlier in unistdh.inc...
-function crypt(__key:Pchar; __salt:Pchar):Pchar;cdecl;external clib name 'crypt';
-procedure setkey(__key:Pchar);cdecl;external clib name 'setkey';
-procedure encrypt(__block:Pchar; __edflag:longint);cdecl;external clib name 'encrypt';
+function crypt(__key:Pchar; __salt:Pchar):Pchar;cdecl;external cryptlib name 'crypt';
+procedure setkey(__key:Pchar);cdecl;external cryptlib name 'setkey';
+procedure encrypt(__block:Pchar; __edflag:longint);cdecl;external cryptlib name 'encrypt';
 }
 type
    Pcrypt_data = ^crypt_data;
@@ -20,9 +20,9 @@ type
         initialized : longint;
      end;
 
-function crypt_r(__key:Pchar; __salt:Pchar; __data:Pcrypt_data):Pchar;cdecl;external clib name 'crypt_r';
-procedure setkey_r(__key:Pchar; __data:Pcrypt_data);cdecl;external clib name 'setkey_r';
-procedure encrypt_r(__block:Pchar; __edflag:longint; __data:Pcrypt_data);cdecl;external clib name 'encrypt_r';
+function crypt_r(__key:Pchar; __salt:Pchar; __data:Pcrypt_data):Pchar;cdecl;external cryptlib name 'crypt_r';
+procedure setkey_r(__key:Pchar; __data:Pcrypt_data);cdecl;external cryptlib name 'setkey_r';
+procedure encrypt_r(__block:Pchar; __edflag:longint; __data:Pcrypt_data);cdecl;external cryptlib name 'encrypt_r';
 
 { ---------------------------------------------------------------------
     Borland compatibility types

+ 6 - 6
packages/base/libc/dlfcnh.inc

@@ -3,10 +3,10 @@ Const
   RTLD_NEXT = Pointer(-1);
   RTLD_DEFAULT = nil;
 
-function dlopen(__file:Pchar; __mode:longint):pointer;cdecl;external clib name 'dlopen';
-function dlclose(__handle:pointer):longint;cdecl;external clib name 'dlclose';
-function dlsym(__handle:pointer; __name:Pchar):pointer;cdecl;external clib name 'dlsym';
-function dlvsym(__handle:pointer; __name:Pchar; __version:Pchar):pointer;cdecl;external clib name 'dlvsym';
+function dlopen(__file:Pchar; __mode:longint):pointer;cdecl;external dllib name 'dlopen';
+function dlclose(__handle:pointer):longint;cdecl;external dllib name 'dlclose';
+function dlsym(__handle:pointer; __name:Pchar):pointer;cdecl;external dllib name 'dlsym';
+function dlvsym(__handle:pointer; __name:Pchar; __version:Pchar):pointer;cdecl;external dllib name 'dlvsym';
 function dlerror:Pchar;cdecl;external clib name 'dlerror';
 
 type
@@ -19,7 +19,7 @@ type
         dli_saddr : pointer;
      end;
 
-function dladdr(__address:pointer; __info:PDl_info):longint;cdecl;external clib name 'dladdr';
+function dladdr(__address:pointer; __info:PDl_info):longint;cdecl;external dllib name 'dladdr';
 
 { ---------------------------------------------------------------------
     Borland compatibility types
@@ -29,5 +29,5 @@ Type
   TDLInfo = Dl_info;
   PDLInfo = ^TDLInfo;
 
-function dladdr(__address:pointer; var __info: Dl_info):longint;cdecl;external clib name 'dladdr';
+function dladdr(__address:pointer; var __info: Dl_info):longint;cdecl;external dllib name 'dladdr';
 

+ 2 - 0
packages/base/libc/libc.pp

@@ -9,6 +9,8 @@ uses kerneldefs;
 
 Const
   clib = 'c';
+  dllib = 'dl';
+  cryptlib = 'crypt';
   threadslib = 'pthread';
 
 {$i glue.inc}           // C to Pascal type mappings