--- Merging r44258 into '.':

U    rtl/win/wininc/struct.inc
--- Recording mergeinfo for merge of r44258 into '.':
 U   .
--- Merging r44259 into '.':
U    packages/winunits-base/src/commctrl.pp
U    packages/winunits-base/src/nb30.pp
--- Recording mergeinfo for merge of r44259 into '.':
 G   .
--- Merging r44260 into '.':
G    packages/winunits-base/src/commctrl.pp
--- Recording mergeinfo for merge of r44260 into '.':
 G   .

# revisions: 44258,44259,44260

git-svn-id: branches/fixes_3_2@44263 -

packages/winunits-base/src/commctrl.pp

@@ -75,6 +75,7 @@ CONST CommCtrlDLL = 'comctl32.dll';
 
 {$ifdef win64}
   {$define _win32}
+  {$define _win64}
 {$endif win64}
 
 {$DEFINE WIN32_WINNT=0}                     // NO XP

packages/winunits-base/src/nb30.pp

@@ -37,7 +37,7 @@ Type
     ncb_post        : ncb_post_type;      { POST routine address        }
     ncb_lana_num    : UCHAR;              { lana (adapter) number          }
     ncb_cmd_cplt    : UCHAR;              { $ff => commmand pending       }
-{$ifdef _WIN64}
+{$ifdef WIN64}
     ncb_reserve     : array[0..17] of UCHAR; { reserved, used by BIOS         }
 {$else}
     ncb_reserve     : array[0..9] of UCHAR;  { reserved, used by BIOS         }

rtl/win/wininc/struct.inc

@@ -7363,7 +7363,7 @@ Const
           idCommand : longint;
           fsState : BYTE;
           fsStyle : BYTE;
-{$ifdef _WIN64}
+{$ifdef WIN64}
           bReserved : array[0..5] of BYTE;
 {$else}
           bReserved : array[0..1] of BYTE;
@@ -8592,7 +8592,7 @@ const
   IMAGE_ROM_OPTIONAL_HDR_MAGIC  = $107;
 
 type
-{$ifdef _WIN64}
+{$ifdef WIN64}
   IMAGE_OPTIONAL_HEADER = IMAGE_OPTIONAL_HEADER64;
   PIMAGE_OPTIONAL_HEADER = PIMAGE_OPTIONAL_HEADER64;
 {$else}
@@ -8636,7 +8636,7 @@ type
   TImageRomHeaders = IMAGE_ROM_HEADERS;
   PImageRomHeaders = PIMAGE_ROM_HEADERS;
 
-{$ifdef _WIN64}
+{$ifdef WIN64}
   IMAGE_NT_HEADERS = IMAGE_NT_HEADERS64;
   PIMAGE_NT_HEADERS = PIMAGE_NT_HEADERS64;
 {$else}
@@ -8804,7 +8804,7 @@ type
        end;
      PIMAGE_LOAD_CONFIG_DIRECTORY64 = ^IMAGE_LOAD_CONFIG_DIRECTORY64;
      TIMAGE_LOAD_CONFIG_DIRECTORY64 = IMAGE_LOAD_CONFIG_DIRECTORY64;
-{$ifdef _WIN64}
+{$ifdef WIN64}
      IMAGE_LOAD_CONFIG_DIRECTORY = IMAGE_LOAD_CONFIG_DIRECTORY64;
      TIMAGE_LOAD_CONFIG_DIRECTORY = TIMAGE_LOAD_CONFIG_DIRECTORY64;
      PIMAGE_LOAD_CONFIG_DIRECTORY = PIMAGE_LOAD_CONFIG_DIRECTORY64;