Browse Source

Merge forgotten go32v2 2.6.0 branch changes back into trunk.
------------------------------------------------------------------------
r20580 | pierre | 2012-03-22 17:52:40 +0100 (Thu, 22 Mar 2012) | 1 line

* Set __environ to envp in Setup_environment function
------------------------------------------------------------------------

git-svn-id: trunk@24230 -

pierre 12 years ago
parent
commit
57c5821042
1 changed files with 2 additions and 0 deletions
  1. 2 0
      rtl/go32v2/system.pp

+ 2 - 0
rtl/go32v2/system.pp

@@ -160,6 +160,7 @@ implementation
 
 
 
 
 var
 var
+  c_environ : ppchar;external name '__environ';
   _args : ppchar;external name '_args';
   _args : ppchar;external name '_args';
   __stubinfo : p_stub_info;external name '__stubinfo';
   __stubinfo : p_stub_info;external name '__stubinfo';
   ___dos_argv0 : pchar;external name '___dos_argv0';
   ___dos_argv0 : pchar;external name '___dos_argv0';
@@ -477,6 +478,7 @@ begin
     end;
     end;
   envp := sysgetmem((env_count+1) * sizeof(pchar));
   envp := sysgetmem((env_count+1) * sizeof(pchar));
   if (envp = nil) then HandleError (203);
   if (envp = nil) then HandleError (203);
+  c_environ:=envp;
   cp:=dos_env;
   cp:=dos_env;
   env_count:=0;
   env_count:=0;
   while cp^ <> #0 do
   while cp^ <> #0 do