[Scummvm-git-logs] scummvm master -> c08cf4d5a55573b9549dc5367ec67a53b7dbf373

[digitall]

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:
c08cf4d5a5 HPL1: Remove Forbidden Symbol Exceptions For Newton Library


Commit: c08cf4d5a55573b9549dc5367ec67a53b7dbf373
    https://github.com/scummvm/scummvm/commit/c08cf4d5a55573b9549dc5367ec67a53b7dbf373
Author: D G Turner (digitall at scummvm.org)
Date: 2023-09-07T00:40:16+01:00

Commit Message:
HPL1: Remove Forbidden Symbol Exceptions For Newton Library

This will compile fine without these headers which required
the forbidden symbol exception on Linux x86_64.

Other platforms and ports will need checking with this change.

Changed paths:
    engines/hpl1/engine/libraries/newton/Newton.h
    engines/hpl1/engine/libraries/newton/core/dgTypes.h


diff --git a/engines/hpl1/engine/libraries/newton/Newton.h b/engines/hpl1/engine/libraries/newton/Newton.h
index ab64594e019..fcbdfc03d76 100644
--- a/engines/hpl1/engine/libraries/newton/Newton.h
+++ b/engines/hpl1/engine/libraries/newton/Newton.h
@@ -22,7 +22,6 @@
 #ifndef __NEWTON_H_INCLUDED__
 #define __NEWTON_H_INCLUDED__
 
-#define FORBIDDEN_SYMBOL_ALLOW_ALL
 #include "common/scummsys.h"
 
 #define NEWTON_MAJOR_VERSION 2
diff --git a/engines/hpl1/engine/libraries/newton/core/dgTypes.h b/engines/hpl1/engine/libraries/newton/core/dgTypes.h
index 62b48b6905c..56370d6b85d 100644
--- a/engines/hpl1/engine/libraries/newton/core/dgTypes.h
+++ b/engines/hpl1/engine/libraries/newton/core/dgTypes.h
@@ -22,9 +22,11 @@
 #ifndef AFX_DGTYPES__42YH_HY78GT_YHJ63Y__INCLUDED_
 #define AFX_DGTYPES__42YH_HY78GT_YHJ63Y__INCLUDED_
 
-#define FORBIDDEN_SYMBOL_ALLOW_ALL
 #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>
@@ -109,6 +111,9 @@
 
 #endif
 
+#endif
+// NB: End of disabled header section
+
 //************************************************************
 #ifndef _WIN32
 #ifdef _DEBUG