archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-09-22 12:04:39 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

6916867: Fastdebug build failed after CR 4874070 fix putback

Browse source 
Reviewed-by: art, dcherepanov
This commit is contained in:
Alexey Utkin 2010-01-14 17:56:49 +03:00
parent bbab8a6fb4
commit b5f77a0513
1 changed files with 7 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

9
jdk/src/windows/native/sun/windows/awt_DnDDS.cpp
View file

@ -32,15 +32,20 @@
#pragma pop_macro("bad_alloc") #pragma pop_macro("bad_alloc")
//"bad_alloc" is undefined from here //"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) #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); 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);} void * operator new(size_t size) {return operator new(size, "stl", 1);}
#endif #endif
#include <map>
#include <awt.h> #include <awt.h>
#include <memory.h>
#include <shlobj.h> #include <shlobj.h>
#include <map>
#include "jlong.h" #include "jlong.h"
#include "awt_DataTransferer.h" #include "awt_DataTransferer.h"