Changeset 85204 in vbox for trunk/src/VBox/Devices/Graphics

Timestamp:

Jul 10, 2020 7:43:17 PM (5 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

139179

Message:

shaderlib/wine: Clang 11 adjustments - 3rd try. bugref:9790

Location:

trunk/src/VBox/Devices/Graphics/shaderlib/wine/include

Files:

• pshpack1.h (modified) (1 diff)
• pshpack2.h (modified) (1 diff)
• pshpack4.h (modified) (1 diff)
• pshpack8.h (modified) (1 diff)

trunk/src/VBox/Devices/Graphics/shaderlib/wine/include/pshpack1.h

@@ -111 +111 @@
 #   pragma warning(disable:4103)
 #  endif
-#  if defined(__clang_major__) && defined(__has_warning) && __has_warning("-Wpragma-pack")
-#   pragma clang diagnostic ignored "-Wpragma-pack"
+#  if defined(__clang_major__) && defined(__has_warning)
+#   if __has_warning("-Wpragma-pack")
+#    pragma clang diagnostic ignored "-Wpragma-pack"
+#   endif
 #  endif
 

trunk/src/VBox/Devices/Graphics/shaderlib/wine/include/pshpack2.h

@@ -111 +111 @@
 #   pragma warning(disable:4103)
 #  endif
-#  if defined(__clang_major__) && defined(__has_warning) && __has_warning("-Wpragma-pack")
-#   pragma clang diagnostic ignored "-Wpragma-pack"
+#  if defined(__clang_major__) && defined(__has_warning)
+#   if __has_warning("-Wpragma-pack")
+#    pragma clang diagnostic ignored "-Wpragma-pack"
+#   endif
 #  endif
 

trunk/src/VBox/Devices/Graphics/shaderlib/wine/include/pshpack4.h

@@ -111 +111 @@
 #   pragma warning(disable:4103)
 #  endif
-#  if defined(__clang_major__) && defined(__has_warning) && __has_warning("-Wpragma-pack")
-#   pragma clang diagnostic ignored "-Wpragma-pack"
+#  if defined(__clang_major__) && defined(__has_warning)
+#   if __has_warning("-Wpragma-pack")
+#    pragma clang diagnostic ignored "-Wpragma-pack"
+#   endif
 #  endif
 

trunk/src/VBox/Devices/Graphics/shaderlib/wine/include/pshpack8.h

@@ -111 +111 @@
 #   pragma warning(disable:4103)
 #  endif
-#  if defined(__clang_major__) && defined(__has_warning) && __has_warning("-Wpragma-pack")
-#   pragma clang diagnostic ignored "-Wpragma-pack"
+#  if defined(__clang_major__) && defined(__has_warning)
+#   if __has_warning("-Wpragma-pack")
+#    pragma clang diagnostic ignored "-Wpragma-pack"
+#   endif
 #  endif