Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 4efac86

Browse files
committed
Do not include wchar.h when using PAL
1 parent c5e86d9 commit 4efac86

3 files changed

Lines changed: 5 additions & 7 deletions

File tree

lib/Backend/Backend.h

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,13 @@
11
//-------------------------------------------------------------------------------------------------------
22
// Copyright (C) Microsoft. All rights reserved.
3+
// Copyright (c) ChakraCore Project Contributors. All rights reserved.
34
// Licensed under the MIT license. See LICENSE.txt file in the project root for full license information.
45
//-------------------------------------------------------------------------------------------------------
56
#pragma once
67

8+
#ifndef USING_PAL_STDLIB
79
#include <wchar.h>
10+
#endif
811

912
// =================
1013
// Runtime Includes

lib/Common/Memory/CustomHeap.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
#if ENABLE_NATIVE_CODEGEN || DYNAMIC_INTERPRETER_THUNK
99

1010
#include "Memory/XDataAllocator.h"
11-
#if defined(_M_ARM)
11+
#if defined(_M_ARM) && defined(_WIN32)
1212
#include <wchar.h>
1313
#endif
1414
#include "CustomHeap.h"

lib/Runtime/Base/ittnotify_config.h

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
//-------------------------------------------------------------------------------------------------------
22
// Copyright (C) Microsoft Corporation and contributors. All rights reserved.
3+
// Copyright (c) ChakraCore Project Contributors. All rights reserved.
34
// Licensed under the MIT license. See LICENSE.txt file in the project root for full license information.
45
//-------------------------------------------------------------------------------------------------------
56
#ifndef _ITTNOTIFY_CONFIG_H_
@@ -73,9 +74,6 @@
7374
#include <tchar.h>
7475
#else /* ITT_PLATFORM==ITT_PLATFORM_WIN */
7576
#include <stdint.h>
76-
#if defined(UNICODE) || defined(_UNICODE)
77-
#include <wchar.h>
78-
#endif /* UNICODE || _UNICODE */
7977
#endif /* ITT_PLATFORM==ITT_PLATFORM_WIN */
8078

8179
#ifndef ITTAPI_CDECL
@@ -201,9 +199,6 @@ typedef CRITICAL_SECTION mutex_t;
201199
#define strong_alias(name, aliasname) /* empty for Windows */
202200
#else /* ITT_PLATFORM==ITT_PLATFORM_WIN */
203201
#include <dlfcn.h>
204-
#if defined(UNICODE) || defined(_UNICODE)
205-
#include <wchar.h>
206-
#endif /* UNICODE */
207202
#ifndef _GNU_SOURCE
208203
#define _GNU_SOURCE 1 /* need for PTHREAD_MUTEX_RECURSIVE */
209204
#endif /* _GNU_SOURCE */

0 commit comments

Comments
 (0)