Skip to content

Commit 6552a52

Browse files
author
Jianchun Xu
committed
Revert "fix a pal build issue on my machine"
This reverts commit c49e4af. It should now work after Oguz removed wchar_t redef from PAL.
1 parent d16464c commit 6552a52

File tree

1 file changed

+6
-14
lines changed

1 file changed

+6
-14
lines changed

pal/src/cruntime/finite.cpp

Lines changed: 6 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
//
22
// Copyright (c) Microsoft. All rights reserved.
3-
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
3+
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
44
//
55

66
/*++
@@ -21,15 +21,7 @@ Module Name:
2121

2222
#include "pal/palinternal.h"
2323
#include "pal/dbgmsg.h"
24-
25-
#if defined(__cplusplus)
26-
#undef wchar_t
27-
#endif
2824
#include <math.h>
29-
#if defined(__cplusplus)
30-
#undef wchar_t
31-
#define wchar_t __wchar_16_cpp__
32-
#endif // __cplusplus
3325

3426
#if HAVE_IEEEFP_H
3527
#include <ieeefp.h>
@@ -106,8 +98,8 @@ _isnan(
10698
10799
See MSDN doc
108100
--*/
109-
double
110-
__cdecl
101+
double
102+
__cdecl
111103
_copysign(
112104
double x,
113105
double y)
@@ -254,7 +246,7 @@ PALIMPORT double __cdecl PAL_exp(double x)
254246
PERF_ENTRY(exp);
255247
ENTRY("exp (x=%f)\n", x);
256248
#if !HAVE_COMPATIBLE_EXP
257-
if (x == 1.0)
249+
if (x == 1.0)
258250
{
259251
ret = M_E;
260252
}
@@ -282,8 +274,8 @@ PALIMPORT LONG __cdecl PAL_labs(LONG l)
282274

283275
PERF_ENTRY(labs);
284276
ENTRY("labs (l=%ld)\n", l);
285-
286-
lRet = labs(l);
277+
278+
lRet = labs(l);
287279

288280
LOGEXIT("labs returns long %ld\n", lRet);
289281
PERF_EXIT(labs);

0 commit comments

Comments
 (0)