--- Merging r21035 into '.':

U    compiler/globals.pas

# revisions: 21035
r21035 | sergei | 2012-04-25 17:28:55 +0200 (Wed, 25 Apr 2012) | 1 line
Changed paths:
   M /trunk/compiler/globals.pas

* For Win64, handle environment variables the same way as on Win32 (the generic version of GetEnvPChar does not return nil for non-existent environment variables).

git-svn-id: branches/fixes_2_6@22700 -

compiler/globals.pas

@@ -810,7 +810,7 @@ implementation
  ****************************************************************************}
 
     function GetEnvPChar(const envname:ansistring):pchar;
-      {$ifdef win32}
+      {$ifdef mswindows}
       var
         s     : string;
         i,len : longint;
@@ -821,7 +821,7 @@ implementation
         GetEnvPchar:=BaseUnix.fpGetEnv(pansichar(envname));
         {$define GETENVOK}
       {$endif}
-      {$ifdef win32}
+      {$ifdef mswindows}
         GetEnvPchar:=nil;
         p:=GetEnvironmentStrings;
         hp:=p;