浏览代码

Disable SysFreeMem call for argv for win16 OS, which does not use SysFreeMem

git-svn-id: trunk@33715 -
pierre 9 年之前
父节点
当前提交
06b0bb56c1
共有 1 个文件被更改,包括 4 次插入4 次删除
  1. 4 4
      rtl/inc/system.inc

+ 4 - 4
rtl/inc/system.inc

@@ -532,7 +532,7 @@ function aligntoptr(p : pointer) : pointer;inline;
  * OTHER DEALINGS IN THE SOFTWARE.
  * OTHER DEALINGS IN THE SOFTWARE.
  *
  *
  * For more information, please refer to <http://unlicense.org/>
  * For more information, please refer to <http://unlicense.org/>
- * 
+ *
  *}
  *}
 
 
 {$R-} {range checking off}
 {$R-} {range checking off}
@@ -610,7 +610,7 @@ begin
     begin
     begin
       mtwist_init(RandSeed);
       mtwist_init(RandSeed);
       { Detect resets of randseed
       { Detect resets of randseed
-      
+
         This will break if someone coincidentally uses not(randseed) as the
         This will break if someone coincidentally uses not(randseed) as the
         next randseed, but it's much more common that you will reset randseed
         next randseed, but it's much more common that you will reset randseed
         to the same value as before to regenerate the same sequence of numbers
         to the same value as before to regenerate the same sequence of numbers
@@ -1006,7 +1006,7 @@ Begin
   { Show runtime error and exit }
   { Show runtime error and exit }
   if WriteErrorsToStdErr then
   if WriteErrorsToStdErr then
     pstdout:=@stderr
     pstdout:=@stderr
-  else  
+  else
     pstdout:=@stdout;
     pstdout:=@stdout;
   If erroraddr<>nil Then
   If erroraddr<>nil Then
    Begin
    Begin
@@ -1023,7 +1023,7 @@ Begin
   { Finalize units }
   { Finalize units }
   FinalizeUnits;
   FinalizeUnits;
 
 
-{$if defined(MSWINDOWS) or defined(OS2)}
+{$if (defined(MSWINDOWS) and not defined(win16)) or defined(OS2)}
   { finally release the heap if possible, especially
   { finally release the heap if possible, especially
     important for DLLs.
     important for DLLs.
     Reset the array to nil, and finally also argv itself to
     Reset the array to nil, and finally also argv itself to