浏览代码

* renamed windows related units from win32 to win so it can contain ce and 64 bit stuff

git-svn-id: trunk@213 -
florian 20 年之前
父节点
当前提交
c97714de9f

+ 2 - 2
.gitattributes

@@ -398,7 +398,7 @@ compiler/systems/i_palmos.pas svneol=native#text/plain
 compiler/systems/i_sunos.pas svneol=native#text/plain
 compiler/systems/i_watcom.pas svneol=native#text/plain
 compiler/systems/i_wdosx.pas svneol=native#text/plain
-compiler/systems/i_win32.pas svneol=native#text/plain
+compiler/systems/i_win.pas svneol=native#text/plain
 compiler/systems/mac_crea.txt svneol=native#text/plain
 compiler/systems/t_amiga.pas svneol=native#text/plain
 compiler/systems/t_atari.pas svneol=native#text/plain
@@ -416,7 +416,7 @@ compiler/systems/t_palmos.pas svneol=native#text/plain
 compiler/systems/t_sunos.pas svneol=native#text/plain
 compiler/systems/t_watcom.pas svneol=native#text/plain
 compiler/systems/t_wdosx.pas svneol=native#text/plain
-compiler/systems/t_win32.pas svneol=native#text/plain
+compiler/systems/t_win.pas svneol=native#text/plain
 compiler/tgobj.pas svneol=native#text/plain
 compiler/tokens.pas svneol=native#text/plain
 compiler/utils/Makefile -text

+ 1 - 1
compiler/compiler.pas

@@ -202,7 +202,7 @@ uses
   ,i_wdosx
 {$endif wdosx}
 {$ifdef win32}
-  ,i_win32
+  ,i_win
 {$endif win32}
   { assembler readers }
 {$ifdef i386}

+ 2 - 2
compiler/i386/cputarg.pas

@@ -50,8 +50,8 @@ implementation
     {$ifndef NOTARGETOS2}
       ,t_os2
     {$endif}
-    {$ifndef NOTARGETWIN32}
-      ,t_win32
+    {$ifndef NOTARGETWIN}
+      ,t_win
     {$endif}
     {$ifndef NOTARGETNETWARE}
       ,t_nwm

+ 1 - 1
compiler/systems/i_win32.pas → compiler/systems/i_win.pas

@@ -19,7 +19,7 @@
  ****************************************************************************
 }
 { This unit implements support information structures for win32. }
-unit i_win32;
+unit i_win;
 
   interface
 

+ 1 - 1
compiler/systems/t_wdosx.pas

@@ -31,7 +31,7 @@ implementation
     uses
        cutils,
        fmodule,globals,systems,
-       import,export,link,t_win32,i_wdosx;
+       import,export,link,t_win,i_wdosx;
 
   type
     timportlibwdosx=class(timportlibwin32)

+ 2 - 2
compiler/systems/t_win32.pas → compiler/systems/t_win.pas

@@ -19,7 +19,7 @@
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  ****************************************************************************
 }
-unit t_win32;
+unit t_win;
 
 {$i fpcdefs.inc}
 
@@ -34,7 +34,7 @@ interface
 {$ifdef GDB}
        gdb,
 {$endif}
-       import,export,link,cgobj,i_win32;
+       import,export,link,cgobj,i_win;
 
 
   const

+ 7 - 7
compiler/x86/cgx86.pas

@@ -142,9 +142,9 @@ unit cgx86;
          S_NO,S_NO,S_NO,S_NO,S_T);
 {$endif x86_64}
 
-{$ifndef NOTARGETWIN32}
+{$ifndef NOTARGETWIN}
       winstackpagesize = 4096;
-{$endif NOTARGETWIN32}
+{$endif NOTARGETWIN}
 
 
   implementation
@@ -1644,7 +1644,7 @@ unit cgx86;
 
       begin
         case target_info.system of
-        {$ifndef NOTARGETWIN32}
+        {$ifndef NOTARGETWIN}
            system_i386_win32,
         {$endif}
            system_i386_freebsd,
@@ -1687,18 +1687,18 @@ unit cgx86;
 
     procedure tcgx86.g_stackpointer_alloc(list : taasmoutput;localsize : longint);
 {$ifdef i386}
-{$ifndef NOTARGETWIN32}
+{$ifndef NOTARGETWIN}
       var
         href : treference;
         i : integer;
         again : tasmlabel;
-{$endif NOTARGETWIN32}
+{$endif NOTARGETWIN}
 {$endif i386}
       begin
         if localsize>0 then
          begin
 {$ifdef i386}
-{$ifndef NOTARGETWIN32}
+{$ifndef NOTARGETWIN}
            { windows guards only a few pages for stack growing, }
            { so we have to access every page first              }
            if (target_info.system=system_i386_win32) and
@@ -1729,7 +1729,7 @@ unit cgx86;
                  end
              end
            else
-{$endif NOTARGETWIN32}
+{$endif NOTARGETWIN}
 {$endif i386}
             list.concat(Taicpu.Op_const_reg(A_SUB,tcgsize2opsize[OS_ADDR],localsize,NR_STACK_POINTER_REG));
          end;