Skip to content
Permalink
Browse files
8241087: Build failure with VS 2019 (16.5.0) due to C2039 and C2873
Reviewed-by: serb
  • Loading branch information
YaSuenag committed Mar 23, 2020
1 parent ef335c7 commit 545643880c5bf00de850317b4b8c6f85074a2942
Showing 3 changed files with 5 additions and 8 deletions.
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2009, 2020, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -23,7 +23,6 @@
* questions.
*/

#include "awt.h"
#include "awt_ole.h"
#include "awt_DCHolder.h" // main symbols

@@ -1,5 +1,5 @@
/*
* Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1997, 2020, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -23,18 +23,16 @@
* questions.
*/

#include "awt.h"
#include <shlwapi.h>
#include <shellapi.h>
#include <memory.h>

#include "awt_DataTransferer.h"
#include "awt_Toolkit.h"
#include "java_awt_dnd_DnDConstants.h"
#include "sun_awt_windows_WDropTargetContextPeer.h"
#include "awt_Container.h"
#include "alloc.h"
#include "awt_ole.h"
#include "awt_Toolkit.h"
#include "awt_DnDDT.h"
#include "awt_DnDDS.h"

@@ -1,5 +1,5 @@
/*
* Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2009, 2020, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -26,10 +26,10 @@
#ifndef AWT_OLE_H
#define AWT_OLE_H

#include "awt.h"
#include <ole2.h>
#include <comdef.h>
#include <comutil.h>
#include "awt.h"

#ifdef _DEBUG
#define _SUN_DEBUG

0 comments on commit 5456438

Please sign in to comment.