commit a613de2a22e648c7b0b3a9e97ea74dcef640f24b
author Daniel Marmier <d.marmier@bluewin.ch> Tue Sep 30 00:33:47 2003 +0000
committer Alexandre Julliard <julliard@winehq.org> Tue Sep 30 00:33:47 2003 +0000
tree e153e1189c7bbc89173bfdab04b418f3698f7b62
parent bd554e63fcf92ab18c4407e475f1a42dfa64134c

Use #ifdef instead of #if for all feature tests.
Check that _MSC_VER is defined before using it.

tools/winapi/winapi_test

diff --git a/tools/winapi/winapi_test b/tools/winapi/winapi_test
index 6012ef9..66938b8 100755
--- a/tools/winapi/winapi_test
+++ b/tools/winapi/winapi_test
@@ -483,7 +483,7 @@
     print OUT " * Windows API extension\n";
     print OUT " */\n";
     print OUT "\n";
-    print OUT "#if (_MSC_VER >= 1300) && defined(__cplusplus)\n";
+    print OUT "#if defined(_MSC_VER) && (_MSC_VER >= 1300) && defined(__cplusplus)\n";
     print OUT "# define FIELD_ALIGNMENT(type, field) __alignof(((type*)0)->field)\n";
     print OUT "#elif defined(__GNUC__)\n";
     print OUT "# define FIELD_ALIGNMENT(type, field) __alignof__(((type*)0)->field)\n";
@@ -491,7 +491,7 @@
     print OUT "/* FIXME: Not sure if is possible to do without compiler extension */\n";
     print OUT "#endif\n";
     print OUT "\n";
-    print OUT "#if (_MSC_VER >= 1300) && defined(__cplusplus)\n";
+    print OUT "#if defined(_MSC_VER) && (_MSC_VER >= 1300) && defined(__cplusplus)\n";
     print OUT "# define _TYPE_ALIGNMENT(type) __alignof(type)\n";
     print OUT "#elif defined(__GNUC__)\n";
     print OUT "# define _TYPE_ALIGNMENT(type) __alignof__(type)\n";