Skip to content

W
wine-winehq
Commit 5512ae26 authored by Francois Gouget's avatar Francois Gouget Committed by Alexandre Julliard
Browse files
Options

Disable MSVC warning 4116 to avoid the 'unnamed type definition in

parentheses' warning caused by TYPE_ALIGNMENT().
parent 8100e0ee
Hide whitespace changes
Inline Side-by-side
Showing with 36 additions and 0 deletions
dlls/gdi/tests/generated.c
View file @ 5512ae26
...@@ -47,6 +47,10 @@ ...@@ -47,6 +47,10 @@
*/ */
#endif #endif
#if defined(TYPE_ALIGNMENT) && defined(_MSC_VER) && _MSC_VER >= 800 && !defined(__cplusplus)
#pragma warning(disable:4116)
#endif
#if !defined(TYPE_ALIGNMENT) && defined(_TYPE_ALIGNMENT) #if !defined(TYPE_ALIGNMENT) && defined(_TYPE_ALIGNMENT)
# define TYPE_ALIGNMENT _TYPE_ALIGNMENT # define TYPE_ALIGNMENT _TYPE_ALIGNMENT
#endif #endif
......
dlls/kernel/tests/generated.c
View file @ 5512ae26
...@@ -47,6 +47,10 @@ ...@@ -47,6 +47,10 @@
*/ */
#endif #endif
#if defined(TYPE_ALIGNMENT) && defined(_MSC_VER) && _MSC_VER >= 800 && !defined(__cplusplus)
#pragma warning(disable:4116)
#endif
#if !defined(TYPE_ALIGNMENT) && defined(_TYPE_ALIGNMENT) #if !defined(TYPE_ALIGNMENT) && defined(_TYPE_ALIGNMENT)
# define TYPE_ALIGNMENT _TYPE_ALIGNMENT # define TYPE_ALIGNMENT _TYPE_ALIGNMENT
#endif #endif
......
dlls/ntdll/tests/generated.c
View file @ 5512ae26
...@@ -47,6 +47,10 @@ ...@@ -47,6 +47,10 @@
*/ */
#endif #endif
#if defined(TYPE_ALIGNMENT) && defined(_MSC_VER) && _MSC_VER >= 800 && !defined(__cplusplus)
#pragma warning(disable:4116)
#endif
#if !defined(TYPE_ALIGNMENT) && defined(_TYPE_ALIGNMENT) #if !defined(TYPE_ALIGNMENT) && defined(_TYPE_ALIGNMENT)
# define TYPE_ALIGNMENT _TYPE_ALIGNMENT # define TYPE_ALIGNMENT _TYPE_ALIGNMENT
#endif #endif
......
dlls/shell32/tests/generated.c
View file @ 5512ae26
...@@ -54,6 +54,10 @@ ...@@ -54,6 +54,10 @@
*/ */
#endif #endif
#if defined(TYPE_ALIGNMENT) && defined(_MSC_VER) && _MSC_VER >= 800 && !defined(__cplusplus)
#pragma warning(disable:4116)
#endif
#if !defined(TYPE_ALIGNMENT) && defined(_TYPE_ALIGNMENT) #if !defined(TYPE_ALIGNMENT) && defined(_TYPE_ALIGNMENT)
# define TYPE_ALIGNMENT _TYPE_ALIGNMENT # define TYPE_ALIGNMENT _TYPE_ALIGNMENT
#endif #endif
......
dlls/shlwapi/tests/generated.c
View file @ 5512ae26
...@@ -52,6 +52,10 @@ ...@@ -52,6 +52,10 @@
*/ */
#endif #endif
#if defined(TYPE_ALIGNMENT) && defined(_MSC_VER) && _MSC_VER >= 800 && !defined(__cplusplus)
#pragma warning(disable:4116)
#endif
#if !defined(TYPE_ALIGNMENT) && defined(_TYPE_ALIGNMENT) #if !defined(TYPE_ALIGNMENT) && defined(_TYPE_ALIGNMENT)
# define TYPE_ALIGNMENT _TYPE_ALIGNMENT # define TYPE_ALIGNMENT _TYPE_ALIGNMENT
#endif #endif
......
dlls/urlmon/tests/generated.c
View file @ 5512ae26
...@@ -50,6 +50,10 @@ ...@@ -50,6 +50,10 @@
*/ */
#endif #endif
#if defined(TYPE_ALIGNMENT) && defined(_MSC_VER) && _MSC_VER >= 800 && !defined(__cplusplus)
#pragma warning(disable:4116)
#endif
#if !defined(TYPE_ALIGNMENT) && defined(_TYPE_ALIGNMENT) #if !defined(TYPE_ALIGNMENT) && defined(_TYPE_ALIGNMENT)
# define TYPE_ALIGNMENT _TYPE_ALIGNMENT # define TYPE_ALIGNMENT _TYPE_ALIGNMENT
#endif #endif
......
dlls/user/tests/generated.c
View file @ 5512ae26
...@@ -47,6 +47,10 @@ ...@@ -47,6 +47,10 @@
*/ */
#endif #endif
#if defined(TYPE_ALIGNMENT) && defined(_MSC_VER) && _MSC_VER >= 800 && !defined(__cplusplus)
#pragma warning(disable:4116)
#endif
#if !defined(TYPE_ALIGNMENT) && defined(_TYPE_ALIGNMENT) #if !defined(TYPE_ALIGNMENT) && defined(_TYPE_ALIGNMENT)
# define TYPE_ALIGNMENT _TYPE_ALIGNMENT # define TYPE_ALIGNMENT _TYPE_ALIGNMENT
#endif #endif
......
dlls/wininet/tests/generated.c
View file @ 5512ae26
...@@ -51,6 +51,10 @@ ...@@ -51,6 +51,10 @@
*/ */
#endif #endif
#if defined(TYPE_ALIGNMENT) && defined(_MSC_VER) && _MSC_VER >= 800 && !defined(__cplusplus)
#pragma warning(disable:4116)
#endif
#if !defined(TYPE_ALIGNMENT) && defined(_TYPE_ALIGNMENT) #if !defined(TYPE_ALIGNMENT) && defined(_TYPE_ALIGNMENT)
# define TYPE_ALIGNMENT _TYPE_ALIGNMENT # define TYPE_ALIGNMENT _TYPE_ALIGNMENT
#endif #endif
......
tools/winapi/winapi_test
View file @ 5512ae26
...@@ -523,6 +523,10 @@ sub output_header { ...@@ -523,6 +523,10 @@ sub output_header {
print OUT " */\n"; print OUT " */\n";
print OUT "#endif\n"; print OUT "#endif\n";
print OUT "\n"; print OUT "\n";
print OUT "#if defined(TYPE_ALIGNMENT) && defined(_MSC_VER) && _MSC_VER >= 800 && !defined(__cplusplus)\n";
print OUT "#pragma warning(disable:4116)\n";
print OUT "#endif\n";
print OUT "\n";
print OUT "#if !defined(TYPE_ALIGNMENT) && defined(_TYPE_ALIGNMENT)\n"; print OUT "#if !defined(TYPE_ALIGNMENT) && defined(_TYPE_ALIGNMENT)\n";
print OUT "# define TYPE_ALIGNMENT _TYPE_ALIGNMENT\n"; print OUT "# define TYPE_ALIGNMENT _TYPE_ALIGNMENT\n";
print OUT "#endif\n"; print OUT "#endif\n";
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment