# HG changeset patch
# User coleenp
# Date 1380740798 14400
# Node ID 4dfcab35c3359dcfd6154be8d21f4b82b1a66c4d
# Parent  a9e8d6ee8403cb944a9d133f6f46b82caace18e5# Parent  b962c8b684758fc4d72d5e6a62dbecacad9868fd
Merge

diff -r a9e8d6ee8403 -r 4dfcab35c335 hotspot/make/windows/makefiles/fastdebug.make
--- a/hotspot/make/windows/makefiles/fastdebug.make	Wed Oct 02 15:17:20 2013 +0200
+++ b/hotspot/make/windows/makefiles/fastdebug.make	Wed Oct 02 15:06:38 2013 -0400
@@ -38,7 +38,7 @@
 !include ../local.make
 !include compile.make
 
-CXX_FLAGS=$(CXX_FLAGS) $(FASTDEBUG_OPT_OPTION) /D "CHECK_UNHANDLED_OOPS"
+CXX_FLAGS=$(CXX_FLAGS) $(FASTDEBUG_OPT_OPTION)
 
 !include $(WorkSpace)/make/windows/makefiles/vm.make
 !include local.make