[Scummvm-git-logs] scummvm master -> 23c781085cc6660fa5d92de87e4d898a4145c6c0
grisenti
noreply at scummvm.org
Thu Sep 7 13:07:31 UTC 2023
This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
23c781085c HPL1: Remove platform specific includes
Commit: 23c781085cc6660fa5d92de87e4d898a4145c6c0
https://github.com/scummvm/scummvm/commit/23c781085cc6660fa5d92de87e4d898a4145c6c0
Author: grisenti (emanuele at grisenti.net)
Date: 2023-09-07T15:07:06+02:00
Commit Message:
HPL1: Remove platform specific includes
Changed paths:
engines/hpl1/engine/libraries/newton/core/dgTypes.h
diff --git a/engines/hpl1/engine/libraries/newton/core/dgTypes.h b/engines/hpl1/engine/libraries/newton/core/dgTypes.h
index 7be14bff20e..b741bdd1b5e 100644
--- a/engines/hpl1/engine/libraries/newton/core/dgTypes.h
+++ b/engines/hpl1/engine/libraries/newton/core/dgTypes.h
@@ -24,96 +24,6 @@
#include "common/scummsys.h"
-// NB: Disable this section of header as not necessary and would require forbidden symbol exceptions to compile
-// FIXME: Remove completely if all ports are happy with this...
-#if 0
-#include <ctype.h>
-#include <math.h>
-#include <new>
-#include <stdarg.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <time.h>
-
-#ifdef _WIN32
-#ifdef _MSC_VER
-#pragma warning(disable : 4324) // structure was padded due to __declspec(align())
-#pragma warning(disable : 4100) // unreferenced formal parameter
-#pragma warning(disable : 4725) // instruction may be inaccurate on some Pentium
-#pragma warning(disable : 4201) // nonstandard extension used : nameless struct/union
-#pragma warning(disable : 4820) //'4' bytes padding added after data member '_finddata32i64_t::name'
-#pragma warning(disable : 4514) //'exp_2' : unreferenced inline function has been removed
-#pragma warning(disable : 4987) // nonstandard extension used: 'throw (...)'
-#pragma warning(disable : 4710) //'std::_Exception_ptr std::_Exception_ptr::_Current_exception(void)' : function not inlined
-#pragma warning(disable : 4826) // Conversion from 'void *' to 'dgUnsigned64' is sign-extended. This may cause unexpected runtime behavior.
-#pragma warning(disable : 4061) // enumerator 'm_convexConvexIntance' in switch of enum 'dgCollisionID' is not explicitly handled by a case label
-#pragma warning(disable : 4191) //'type cast' : unsafe conversion from 'NewtonWorldRayFilterCallback' to 'OnRayCastAction'
-#pragma warning(disable : 4711) // function 'float const & __thiscall dgTemplateVector<float>::operator[](int)const ' selected for automatic inline expansion
-#pragma warning(disable : 4530) // C++ exception handler used, but unwind semantics are not enabled. Specify /EHsc
-
-#if (_MSC_VER >= 1400)
-#pragma warning(disable : 4996) // '_controlfp' was declared deprecated
-#else
-#pragma warning(disable : 4505) // unreferenced local function has been removed
-#pragma warning(disable : 4514) // function '$E1' selected for automatic inline expansion
-#endif
-
-#ifdef _DEBUG
-#pragma warning(disable : 4127) // conditional expression is constant
-#endif
-#endif
-
-#ifdef _MSC_VER
-#pragma warning(push, 3)
-#endif
-
-//#include <crtdbg.h>
-
-// #include <mmsystem.h>
-
-#ifdef _MSC_VER
-#pragma warning(pop)
-#endif
-
-#include <direct.h>
-#include <float.h>
-#include <io.h>
-#include <malloc.h>
-#include <process.h>
-
-#else
-#include <assert.h>
-
-#ifdef __APPLE__
-#include <libkern/OSAtomic.h>
-#include <sys/sysctl.h>
-#endif
-#endif
-
-#ifdef DG_BUILD_SIMD_CODE
-
-#ifdef _WIN32
-#if (_MSC_VER >= 1400) || defined(__MINGW32__)
-#include <intrin.h>
-#else
-#if (_MSC_VER >= 1300)
-#include <xmmintrin.h>
-#endif
-#endif
-#else
-#include <xmmintrin.h>
-#endif
-
-#ifdef __ppc__
-#include <vecLib/veclib.h>
-#endif
-
-#endif
-
-#endif
-// NB: End of disabled header section
-
//************************************************************
#define __USE_CPU_FOUND__
More information about the Scummvm-git-logs
mailing list