From b5f77a0513acb04465d55ed59f1181cd596cc24a Mon Sep 17 00:00:00 2001
From: Alexey Utkin <uta@openjdk.org>
Date: Thu, 14 Jan 2010 17:56:49 +0300
Subject: [PATCH] 6916867: Fastdebug build failed after CR 4874070 fix putback

Reviewed-by: art, dcherepanov
---
 jdk/src/windows/native/sun/windows/awt_DnDDS.cpp | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/jdk/src/windows/native/sun/windows/awt_DnDDS.cpp b/jdk/src/windows/native/sun/windows/awt_DnDDS.cpp
index eb69e8bf681..cfd3e97a2e1 100644
--- a/jdk/src/windows/native/sun/windows/awt_DnDDS.cpp
+++ b/jdk/src/windows/native/sun/windows/awt_DnDDS.cpp
@@ -32,15 +32,20 @@
 #pragma pop_macro("bad_alloc")
 //"bad_alloc" is undefined from here
 
+//we need to include any STL container before <awt.h> inclusion due to
+//"new" re-redefinition that is in conflict with in-place new allocator
+//applied in STL.
 #if defined(_DEBUG) || defined(DEBUG)
+    //forward declaration of "new" operator from <awt.h>
     extern void * operator new(size_t size, const char * filename, int linenumber);
+    //"new" operator definition that is consistent with re-defined
+    //in <awt.h> "delete" operator
     void * operator new(size_t size) {return operator new(size, "stl", 1);}
 #endif
+#include <map>
 
 #include <awt.h>
-#include <memory.h>
 #include <shlobj.h>
-#include <map>
 
 #include "jlong.h"
 #include "awt_DataTransferer.h"