Skip to content

Commit

Permalink
8241087: Build failure with VS 2019 (16.5.0) due to C2039 and C2873
Browse files Browse the repository at this point in the history
Backport-of: 7166e13838a545b1e75307defc2cfa173dc38d20
  • Loading branch information
Alexey Pavlyutkin authored and Yuri Nesterenko committed Dec 1, 2022
1 parent 7b54850 commit 918a2ab
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 7 deletions.
3 changes: 1 addition & 2 deletions jdk/src/windows/native/sun/windows/awt_DCHolder.cpp
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -23,7 +23,6 @@
* questions.
*/

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

Expand Down
4 changes: 1 addition & 3 deletions jdk/src/windows/native/sun/windows/awt_DnDDT.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
4 changes: 2 additions & 2 deletions jdk/src/windows/native/sun/windows/awt_ole.h
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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
Expand Down

1 comment on commit 918a2ab

@openjdk-notifier
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please sign in to comment.