wraitii
d92a2118b0
This ugprades 0 A.D. to the latest ESR at the moment of writing. Mostly straighforward API changes (see meta-Bug 1633145) - js::Class is merged with JSClass - JSNewArrayObject becomes JS::NewArrayObject - ArrayObject-functions are moved to a new public header Array.h - JSMSG error messages have again been changed, requiring some tweaks. - AutoValueArray becomes RootedBalueArray (Bug 1634435) - 'uneval' is behind a Realm flag (Bug 1565170), but no removal is planned in the short-term future. - Some minor GC API changes (Bugs 1569564 and 1633405) - Error reporting has had some tweaks, and error flags have been removed (Bug 1620583) - StructuredClone are now always thread-safe, simplifying an API change introduced in SM52 (Bug 1607791) Tested by: Stan, Freagarach, mammadori Closes #5861 Differential Revision: https://code.wildfiregames.com/D3168 This was SVN commit r24333.
76 lines
2.1 KiB
C++
76 lines
2.1 KiB
C++
/* Copyright (C) 2016 Wildfire Games.
|
|
* This file is part of 0 A.D.
|
|
*
|
|
* 0 A.D. is free software: you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License as published by
|
|
* the Free Software Foundation, either version 2 of the License, or
|
|
* (at your option) any later version.
|
|
*
|
|
* 0 A.D. is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with 0 A.D. If not, see <http://www.gnu.org/licenses/>.
|
|
*/
|
|
|
|
#ifndef INCLUDED_SCRIPTEXTRAHEADERS
|
|
#define INCLUDED_SCRIPTEXTRAHEADERS
|
|
|
|
// Includes occasionally-used SpiderMonkey headers for typed arrays and debug API,
|
|
// with appropriate tweaks to fix warnings and build errors. (Most code should
|
|
// just include ScriptTypes.h directly to get the standard jsapi.h.)
|
|
|
|
#include "scriptinterface/ScriptTypes.h"
|
|
|
|
// Ignore some harmless warnings
|
|
#if GCC_VERSION
|
|
# pragma GCC diagnostic push
|
|
# pragma GCC diagnostic ignored "-Wunused-parameter"
|
|
# pragma GCC diagnostic ignored "-Wredundant-decls"
|
|
# pragma GCC diagnostic ignored "-Wnon-virtual-dtor"
|
|
#endif
|
|
#if CLANG_VERSION
|
|
# pragma clang diagnostic push
|
|
# pragma clang diagnostic ignored "-Wmismatched-tags"
|
|
#endif
|
|
#if MSC_VERSION
|
|
// reduce the warning level for the SpiderMonkey headers
|
|
# pragma warning(push, 1)
|
|
#endif
|
|
|
|
// Redefine signbit to fix build error in GCC
|
|
#ifndef signbit
|
|
# define signbit std::signbit
|
|
#endif
|
|
|
|
#include "jsfriendapi.h"
|
|
|
|
#include "js/Array.h"
|
|
#include "js/ArrayBuffer.h"
|
|
#include "js/CompilationAndEvaluation.h"
|
|
#include "js/Conversions.h"
|
|
#include "js/ContextOptions.h"
|
|
#include "js/ForOfIterator.h"
|
|
#include "js/GCAPI.h"
|
|
#include "js/JSON.h"
|
|
#include "js/SourceText.h"
|
|
#include "js/StructuredClone.h"
|
|
#include "js/Proxy.h"
|
|
#include "js/Warnings.h"
|
|
|
|
#undef signbit
|
|
|
|
#if MSC_VERSION
|
|
# pragma warning(pop)
|
|
#endif
|
|
#if CLANG_VERSION
|
|
# pragma clang diagnostic pop
|
|
#endif
|
|
#if GCC_VERSION
|
|
# pragma GCC diagnostic pop
|
|
#endif
|
|
|
|
#endif // INCLUDED_SCRIPTEXTRAHEADERS
|