瀏覽代碼

* more "shared" fixes

git-svn-id: trunk@2295 -
marco 19 年之前
父節點
當前提交
768bf94a99
共有 2 個文件被更改,包括 7 次插入2 次删除
  1. 2 0
      rtl/bsd/i386/syscall.inc
  2. 5 2
      rtl/unix/cwstring.pp

+ 2 - 0
rtl/bsd/i386/syscall.inc

@@ -31,6 +31,8 @@ These functions are the same over all three BSDs, except that some have a
  {$DEFINE ErrnoWord}
 {$endif}
 
+Procedure fpc_geteipasebx;[external name 'fpc_geteipasebx'];
+
 procedure actualsyscall; assembler; {inline requires a dummy push IIRC}
     asm
          int $0x80

+ 5 - 2
rtl/unix/cwstring.pp

@@ -26,7 +26,10 @@ implementation
 {$linklib c}
 
 {$ifndef linux}  // Linux (and maybe glibc platforms in general), have iconv in glibc.
-{$linklib iconv}
+{$ifndef FreeBSD5}
+ {$linklib iconv}
+ {$define useiconv}
+{$endif}
 {$endif linux}
 
 Uses
@@ -38,7 +41,7 @@ Uses
   initc;
 
 Const
-{$ifdef Linux}
+{$ifndef useiconv}
     libiconvname='c';  // is in libc under Linux.
 {$else}
     libiconvname='iconv';