From 7d5b632896c7f5abcb300e174f05a803626d21ba Mon Sep 17 00:00:00 2001
From: pierre <pierre@freepascal.org>
Date: Thu, 13 Jan 2011 14:43:37 +0000
Subject: [PATCH] Use MSWindows instead of Win32 conditional
git-svn-id: trunk@16760 -
---
tests/units/popuperr.pp | 9 +++++----
tests/units/win32err.pp | 9 +++++----
2 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/tests/units/popuperr.pp b/tests/units/popuperr.pp
index 58ce94251c..0441f8810c 100644
--- a/tests/units/popuperr.pp
+++ b/tests/units/popuperr.pp
@@ -20,10 +20,11 @@ interface
implementation
-{$ifdef win32}
+{ mswindows is defined for win32 and win64 targets }
+{$ifdef mswindows}
uses
windows;
-{$endif win32}
+{$endif mswindows}
{$IFDEF OS2}
function _DosError (Error: longint): longint; cdecl;
@@ -31,12 +32,12 @@ function _DosError (Error: longint): longint; cdecl;
{$ENDIF OS2}
begin
-{$ifdef win32}
+{$ifdef mswindows}
SetErrorMode(
SEM_FAILCRITICALERRORS or
SEM_NOGPFAULTERRORBOX or
SEM_NOOPENFILEERRORBOX);
-{$endif win32}
+{$endif mswindows}
{$IFDEF OS2}
if os_Mode = osOS2 then _DosError (0);
{$ENDIF OS2}
diff --git a/tests/units/win32err.pp b/tests/units/win32err.pp
index 645dfa38ed..65d9a53ce1 100644
--- a/tests/units/win32err.pp
+++ b/tests/units/win32err.pp
@@ -20,16 +20,17 @@ interface
implementation
-{$ifdef win32}
+{ mswindows is defined for win32 and win64 targets }
+{$ifdef mswindows}
uses
windows;
-{$endif win32}
+{$endif mswindows}
begin
-{$ifdef win32}
+{$ifdef mswindows}
SetErrorMode(
SEM_FAILCRITICALERRORS or
SEM_NOGPFAULTERRORBOX or
SEM_NOOPENFILEERRORBOX);
-{$endif win32}
+{$endif mswindows}
end.