Skip to content

Commit

Permalink
fix 17-06 xplat build breaks and CI copyright check failure
Browse files Browse the repository at this point in the history
  • Loading branch information
Jianchun Xu committed Jun 15, 2017
1 parent bb95963 commit 81f48ef
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 7 deletions.
7 changes: 0 additions & 7 deletions lib/Common/CommonDefines.h
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,6 @@
#include "Warnings.h"
#include "ChakraCoreVersion.h"

#if defined(NTBUILD) && defined(_CHAKRACOREBUILD)
#error NTBUILD and _CHAKRACOREBUILD cannot be both defined
#endif
#if !defined(NTBUILD) && !defined(_CHAKRACOREBUILD)
#error Either NTBUILD or _CHAKRACOREBUILD must be defined
#endif

//----------------------------------------------------------------------------------------------------
// Default debug/fretest/release flags values
// - Set the default values of debug/fretest/release flags if it is not set by the command line
Expand Down
5 changes: 5 additions & 0 deletions test/LetConst/shadowedsetter.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
//-------------------------------------------------------------------------------------------------------
// Copyright (C) Microsoft. All rights reserved.
// Licensed under the MIT license. See LICENSE.txt file in the project root for full license information.
//-------------------------------------------------------------------------------------------------------

evaluate = WScript.LoadScript;

__defineSetter__("x", function () { });
Expand Down

0 comments on commit 81f48ef

Please sign in to comment.