From 6fe284e4018b2586f60876ca4f9452e52db44ae7 Mon Sep 17 00:00:00 2001
From: Phil Race <prr@openjdk.org>
Date: Tue, 26 May 2015 15:06:42 -0700
Subject: [PATCH] 8081231: JDK9 client build broken on Windows

Reviewed-by: azvegint
---
 .../windows/native/libawt/windows/ShellFolder2.cpp             | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/jdk/src/java.desktop/windows/native/libawt/windows/ShellFolder2.cpp b/jdk/src/java.desktop/windows/native/libawt/windows/ShellFolder2.cpp
index cd3918bd4eb..0f5a0e8d942 100644
--- a/jdk/src/java.desktop/windows/native/libawt/windows/ShellFolder2.cpp
+++ b/jdk/src/java.desktop/windows/native/libawt/windows/ShellFolder2.cpp
@@ -64,6 +64,9 @@ DEFINE_SHLGUID(IID_IExtractIconW,       0x000214FAL, 0, 0);
 
 //#include <sun_awt_shell_Win32ShellFolder2.h>
 
+#ifndef DASSERT
+#define DASSERT(x)
+#endif
 #define DEFINE_FIELD_ID(var, cls, field, type)                            \
     jfieldID var = env->GetFieldID(cls, field, type);                     \
     DASSERT(var != NULL);                                                 \