Merged revisions 7083,7089 via svnmerge from

http://svn.freepascal.org/svn/fpc/trunk

r7083 (marco)
 * ifdef win32 -> ifdef mswindows (as per mantis8656) Rest ifdef win32 need to be checked


r7089 (florian)
* mswindows -> windows, WinCE supports OpenGL as well

git-svn-id: branches/fixes_2_2@7099 -

packages/extra/opengl/gl.pp

@@ -44,7 +44,7 @@ Abstract:
 
 {$MODE Delphi}
 {$MACRO ON}
-{$IFDEF Win32}
+{$IFDEF Windows}
   {$DEFINE extdecl := stdcall}
 {$ELSE}
   {$DEFINE extdecl := cdecl}

packages/extra/opengl/glext.pp

@@ -7,7 +7,7 @@
 
 {$MACRO ON}
 {$MODE Delphi}
-{$IFDEF Win32}
+{$IFDEF Windows}
   {$DEFINE extdecl:=stdcall }
 {$ELSE}
   {$DEFINE extdecl:=cdecl }
@@ -27,7 +27,7 @@ interface
 
 uses
   SysUtils,
-  {$IFDEF Win32}
+  {$IFDEF Windows}
   Windows,
   {$ELSE}
   dynlibs,

packages/extra/opengl/glu.pp

@@ -54,7 +54,7 @@ Abstract:
 
 {$MACRO ON}
 {$MODE Delphi}
-{$IFDEF Win32}
+{$IFDEF Windows}
   {$DEFINE extdecl := stdcall}
 {$ELSE}
   {$DEFINE extdecl := cdecl}
@@ -71,7 +71,7 @@ interface
 
 uses
   SysUtils,
-  {$IFDEF Win32}
+  {$IFDEF Windows}
   Windows,
   {$ELSE}
   {$IFDEF MORPHOS}

packages/extra/opengl/glut.pp

@@ -7,7 +7,7 @@
 
 {$MACRO ON}
 {$MODE Delphi}
-{$IFDEF Win32}
+{$IFDEF Windows}
   {$DEFINE extdecl := stdcall}
 {$ELSE}
   {$DEFINE extdecl := cdecl}
@@ -36,7 +36,7 @@ interface
 
 uses
   SysUtils,
-  {$IFDEF Win32}
+  {$IFDEF Windows}
   Windows, dynlibs,
   {$ELSE}
   {$IFDEF MORPHOS}