Sfoglia il codice sorgente

* adapted to new compiler check for externals

armin 21 anni fa
parent
commit
af7a983b6a
3 ha cambiato i file con 21 aggiunte e 11 eliminazioni
  1. 1 1
      rtl/netware/Makefile
  2. 6 2
      rtl/netware/nwsys.inc
  3. 14 8
      rtl/netware/system.pp

+ 1 - 1
rtl/netware/Makefile

@@ -2,7 +2,7 @@
 # Don't edit, this file is generated by FPCMake Version 1.1 [2004/11/04]
 #
 default: all
-MAKEFILETARGETS=netware
+MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom morphos netwlibc
 BSDs = freebsd netbsd openbsd darwin
 UNIXs = linux $(BSDs) sunos qnx
 LIMIT83fs = go32v2 os2

+ 6 - 2
rtl/netware/nwsys.inc

@@ -74,13 +74,14 @@ function _SuspendThread(threadID:longint):longint; cdecl;external ThreadsNlm nam
 function _GetThreadID:longint; cdecl;external ThreadsNlm name 'GetThreadID';
 procedure _ThreadSwitchWithDelay; cdecl;external ThreadsNlm name 'ThreadSwitchWithDelay';
 function _GetThreadName(threadID:longint; var tName):longint; cdecl;external ThreadsNlm name 'GetThreadName';
-
+(*
 PROCEDURE ConsolePrintf (FormatStr : PCHAR; Param : LONGINT); CDecl; EXTERNAL CLib Name 'ConsolePrintf';
 PROCEDURE ConsolePrintf (FormatStr : PCHAR; Param : pchar); CDecl; EXTERNAL CLib Name 'ConsolePrintf';
 PROCEDURE ConsolePrintf (FormatStr : PCHAR; P1,P2 : LONGINT); CDecl; EXTERNAL CLib Name 'ConsolePrintf';
 PROCEDURE ConsolePrintf (FormatStr : PCHAR; P1,P2,P3 : LONGINT); CDecl; EXTERNAL CLib Name 'ConsolePrintf';
 PROCEDURE ConsolePrintf (FormatStr : PCHAR; P1,P2,P3,P4 : LONGINT); CDecl; EXTERNAL CLib Name 'ConsolePrintf';
 PROCEDURE ConsolePrintf (FormatStr : PCHAR); CDecl; EXTERNAL CLib Name 'ConsolePrintf';
+*)
 // this gives internal compiler error 1234124 ??
 //PROCEDURE ConsolePrintf (FormatStr : PCHAR; Param : array of const); CDecl; EXTERNAL CLib;
 
@@ -369,7 +370,10 @@ function spawnvp(mode:longint; path:Pchar; argv:PPchar):longint;cdecl;external C
 
 {
   $Log$
-  Revision 1.11  2004-09-26 19:25:49  armin
+  Revision 1.12  2004-11-25 12:32:08  armin
+  * adapted to new compiler check for externals
+
+  Revision 1.11  2004/09/26 19:25:49  armin
   * exiting threads at nlm unload
 
   Revision 1.10  2004/08/01 20:02:48  armin

+ 14 - 8
rtl/netware/system.pp

@@ -75,12 +75,15 @@ CONST
    envp   : ppchar = nil;   {dummy to make heaptrc happy}
 
 
-procedure ConsolePrintf (FormatStr : PCHAR; Param : LONGINT); CDecl;
-procedure ConsolePrintf (FormatStr : PCHAR; Param : pchar); CDecl;
-procedure ConsolePrintf (FormatStr : PCHAR; P1,P2 : LONGINT);  CDecl;
-procedure ConsolePrintf (FormatStr : PCHAR; P1,P2,P3 : LONGINT);  CDecl;
-procedure ConsolePrintf (FormatStr : PCHAR);  CDecl;
-procedure __EnterDebugger; cdecl;
+procedure ConsolePrintf (FormatStr : PCHAR; Param : LONGINT); CDecl; external 'clib' name 'printf';
+procedure ConsolePrintf (FormatStr : PCHAR; Param : pchar); CDecl; external 'clib' name 'printf';
+procedure ConsolePrintf (FormatStr : PCHAR; P1,P2 : LONGINT);  CDecl; external 'clib' name 'printf';
+procedure ConsolePrintf (FormatStr : PCHAR; P1,P2,P3 : LONGINT);  CDecl; external 'clib' name 'printf';
+procedure ConsolePrintf (FormatStr : PCHAR);  CDecl; external 'clib' name 'printf';
+// this gives internal compiler error 200404181
+// procedure ConsolePrintf (FormatStr : PCHAR; Param : array of const); CDecl; EXTERNAL 'clib' name 'ConsolePrintf';
+
+procedure __EnterDebugger; cdecl; external 'clib' name 'EnterDebugger';
 
 type
   TSysCloseAllRemainingSemaphores = procedure;
@@ -122,7 +125,7 @@ begin
   SetThreadDataAreaPtr := stdata;
 end;
 
-procedure __EnterDebugger; cdecl; external 'clib' name 'EnterDebugger';
+//procedure __EnterDebugger; cdecl; external 'clib' name 'EnterDebugger';
 
 
 procedure PASCALMAIN;external name 'PASCALMAIN';
@@ -976,7 +979,10 @@ Begin
 End.
 {
   $Log$
-  Revision 1.30  2004-11-04 09:32:31  peter
+  Revision 1.31  2004-11-25 12:32:08  armin
+  * adapted to new compiler check for externals
+
+  Revision 1.30  2004/11/04 09:32:31  peter
   ErrOutput added
 
   Revision 1.29  2004/10/25 18:11:49  armin