[Scummvm-git-logs] scummvm master -> 111d25901593e86f2daf231a04041d7de938a05b

lephilousophe noreply at scummvm.org
Mon Aug 22 13:39:01 UTC 2022 

This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
a0f02d93c5 JANITORIAL: Refresh all portdefs
111d259015 ALL: Add limits.h for all codebase


Commit: a0f02d93c510918df25082eae4c52ca0af42502a
    https://github.com/scummvm/scummvm/commit/a0f02d93c510918df25082eae4c52ca0af42502a
Author: Le Philousophe (lephilousophe at users.noreply.github.com)
Date: 2022-08-22T15:38:10+02:00

Commit Message:
JANITORIAL: Refresh all portdefs

Make sure all needed includes are really included

Changed paths:
    backends/platform/android/portdefs.h
    backends/platform/dc/portdefs.h
    backends/platform/ds/portdefs.h
    backends/platform/n64/portdefs.h
    backends/platform/psp/portdefs.h


diff --git a/backends/platform/android/portdefs.h b/backends/platform/android/portdefs.h
index 71558c13b45..13a42c4f01a 100644
--- a/backends/platform/android/portdefs.h
+++ b/backends/platform/android/portdefs.h
@@ -26,12 +26,12 @@
 #include <stdlib.h>
 #include <string.h>
 #include <stdarg.h>
-#include <ctype.h>
+#include <stddef.h>
 #include <assert.h>
-#include <new>
-
+#include <ctype.h>
 #define _USE_MATH_DEFINES
 #include <math.h>
+#include <new>
 
 // This is defined in snprintf.c
 #ifdef __cplusplus
diff --git a/backends/platform/dc/portdefs.h b/backends/platform/dc/portdefs.h
index 64734e0d252..bb1b0f72d88 100644
--- a/backends/platform/dc/portdefs.h
+++ b/backends/platform/dc/portdefs.h
@@ -20,15 +20,18 @@
  */
 
 #include <sys/types.h>
-#include <stdio.h>
 #include <fcntl.h>
+
+#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <stdarg.h>
+#include <stddef.h>
 #include <assert.h>
 #include <ctype.h>
 #include <math.h>
 #include <new>
+
 #ifndef RONIN_TIMER_ACCESS
 #define Timer ronin_Timer
 #endif
diff --git a/backends/platform/ds/portdefs.h b/backends/platform/ds/portdefs.h
index d7bafced318..38e25f86b83 100644
--- a/backends/platform/ds/portdefs.h
+++ b/backends/platform/ds/portdefs.h
@@ -32,11 +32,12 @@ typedef unsigned int uint;
 #define SCUMMVM_DONT_DEFINE_TYPES
 
 // Include required headers
-#include <assert.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <stdarg.h>
+#include <stddef.h>
+#include <assert.h>
 #include <ctype.h>
 #include <math.h>
 #include <new>
diff --git a/backends/platform/n64/portdefs.h b/backends/platform/n64/portdefs.h
index dcc5390e49a..7f769227765 100644
--- a/backends/platform/n64/portdefs.h
+++ b/backends/platform/n64/portdefs.h
@@ -23,11 +23,14 @@
 #define __N64_PORTDEFS__
 
 #include <n64utils.h>
-
 #include <sys/types.h>
-#include <stdarg.h>
-#include <string.h>
+
 #include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <stdarg.h>
+#include <stddef.h>
+// No assert.h
 #include <ctype.h>
 #include <math.h>
 #include <new>
diff --git a/backends/platform/psp/portdefs.h b/backends/platform/psp/portdefs.h
index fdc05ff71ac..eb10d71ee11 100644
--- a/backends/platform/psp/portdefs.h
+++ b/backends/platform/psp/portdefs.h
@@ -28,15 +28,17 @@
 // configure rules, or it should be removed from the aforementioned
 // Makefile.
 
+#include <malloc.h>
+#include <time.h>
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <stdarg.h>
-#include <malloc.h>
-#include <math.h>
-#include <time.h>
-#include <ctype.h>
+#include <stddef.h>
 #include <assert.h>
+#include <ctype.h>
+#include <math.h>
 #include <new>
 
 #include <pspkernel.h>


Commit: 111d25901593e86f2daf231a04041d7de938a05b
    https://github.com/scummvm/scummvm/commit/111d25901593e86f2daf231a04041d7de938a05b
Author: Le Philousophe (lephilousophe at users.noreply.github.com)
Date: 2022-08-22T15:38:10+02:00

Commit Message:
ALL: Add limits.h for all codebase

Changed paths:
    backends/audiocd/macosx/macosx-audiocd.cpp
    backends/platform/android/portdefs.h
    backends/platform/dc/portdefs.h
    backends/platform/ds/portdefs.h
    backends/platform/n64/portdefs.h
    backends/platform/psp/portdefs.h
    backends/platform/sdl/riscos/riscos-utils.cpp
    backends/saves/default/default-saves.h
    base/commandLine.cpp
    common/random.cpp
    common/scummsys.h
    engines/stark/console.cpp
    test/audio/timestamp.h


diff --git a/backends/audiocd/macosx/macosx-audiocd.cpp b/backends/audiocd/macosx/macosx-audiocd.cpp
index e62dcd01b68..c05a0f549f0 100644
--- a/backends/audiocd/macosx/macosx-audiocd.cpp
+++ b/backends/audiocd/macosx/macosx-audiocd.cpp
@@ -44,7 +44,6 @@
 
 #include <sys/stat.h>
 #include <sys/mount.h>
-#include <limits.h>
 
 #include "common/scummsys.h"
 
diff --git a/backends/platform/android/portdefs.h b/backends/platform/android/portdefs.h
index 13a42c4f01a..47cb04be793 100644
--- a/backends/platform/android/portdefs.h
+++ b/backends/platform/android/portdefs.h
@@ -29,6 +29,7 @@
 #include <stddef.h>
 #include <assert.h>
 #include <ctype.h>
+#include <limits.h>
 #define _USE_MATH_DEFINES
 #include <math.h>
 #include <new>
diff --git a/backends/platform/dc/portdefs.h b/backends/platform/dc/portdefs.h
index bb1b0f72d88..da8f10334d6 100644
--- a/backends/platform/dc/portdefs.h
+++ b/backends/platform/dc/portdefs.h
@@ -29,6 +29,7 @@
 #include <stddef.h>
 #include <assert.h>
 #include <ctype.h>
+#include <limits.h>
 #include <math.h>
 #include <new>
 
diff --git a/backends/platform/ds/portdefs.h b/backends/platform/ds/portdefs.h
index 38e25f86b83..251b4951dbb 100644
--- a/backends/platform/ds/portdefs.h
+++ b/backends/platform/ds/portdefs.h
@@ -39,6 +39,7 @@ typedef unsigned int uint;
 #include <stddef.h>
 #include <assert.h>
 #include <ctype.h>
+#include <limits.h>
 #include <math.h>
 #include <new>
 
diff --git a/backends/platform/n64/portdefs.h b/backends/platform/n64/portdefs.h
index 7f769227765..d43e13e48b9 100644
--- a/backends/platform/n64/portdefs.h
+++ b/backends/platform/n64/portdefs.h
@@ -32,6 +32,7 @@
 #include <stddef.h>
 // No assert.h
 #include <ctype.h>
+#include <limits.h>
 #include <math.h>
 #include <new>
 
diff --git a/backends/platform/psp/portdefs.h b/backends/platform/psp/portdefs.h
index eb10d71ee11..d6d10e79ee4 100644
--- a/backends/platform/psp/portdefs.h
+++ b/backends/platform/psp/portdefs.h
@@ -38,6 +38,7 @@
 #include <stddef.h>
 #include <assert.h>
 #include <ctype.h>
+#include <limits.h>
 #include <math.h>
 #include <new>
 
diff --git a/backends/platform/sdl/riscos/riscos-utils.cpp b/backends/platform/sdl/riscos/riscos-utils.cpp
index 07f63938607..68113023de8 100644
--- a/backends/platform/sdl/riscos/riscos-utils.cpp
+++ b/backends/platform/sdl/riscos/riscos-utils.cpp
@@ -23,7 +23,6 @@
 #include "backends/platform/sdl/riscos/riscos-utils.h"
 
 #include <unixlib/local.h>
-#include <limits.h>
 
 namespace RISCOS_Utils {
 
diff --git a/backends/saves/default/default-saves.h b/backends/saves/default/default-saves.h
index 1e52d4b9bad..d0058e52774 100644
--- a/backends/saves/default/default-saves.h
+++ b/backends/saves/default/default-saves.h
@@ -27,7 +27,6 @@
 #include "common/str.h"
 #include "common/fs.h"
 #include "common/hash-str.h"
-#include <limits.h>
 
 /**
  * Provides a default savefile manager implementation for common platforms.
diff --git a/base/commandLine.cpp b/base/commandLine.cpp
index 7dc796d88fd..831eb10d5fd 100644
--- a/base/commandLine.cpp
+++ b/base/commandLine.cpp
@@ -24,8 +24,6 @@
 
 #define FORBIDDEN_SYMBOL_EXCEPTION_exit
 
-#include <limits.h>
-
 #include "engines/advancedDetector.h"
 #include "engines/metaengine.h"
 #include "base/commandLine.h"
diff --git a/common/random.cpp b/common/random.cpp
index 0b792c8b2f3..d87881d883e 100644
--- a/common/random.cpp
+++ b/common/random.cpp
@@ -19,8 +19,6 @@
  *
  */
 
-#include <limits.h>
-
 #include "common/random.h"
 #include "common/system.h"
 #include "gui/EventRecorder.h"
diff --git a/common/scummsys.h b/common/scummsys.h
index bfc3e0dc613..10384dc73d1 100644
--- a/common/scummsys.h
+++ b/common/scummsys.h
@@ -123,6 +123,7 @@
 	#include <stddef.h>
 	#include <assert.h>
 	#include <ctype.h>
+	#include <limits.h>
 	// MSVC does not define M_PI, M_SQRT2 and other math defines by default.
 	// _USE_MATH_DEFINES must be defined in order to have these defined, thus
 	// we enable it here. For more information, check:
diff --git a/engines/stark/console.cpp b/engines/stark/console.cpp
index 42e0147e79e..908143ee422 100644
--- a/engines/stark/console.cpp
+++ b/engines/stark/console.cpp
@@ -41,7 +41,6 @@
 #include "engines/stark/services/staticprovider.h"
 #include "engines/stark/tools/decompiler.h"
 
-#include <limits.h>
 #include "common/file.h"
 
 namespace Stark {
diff --git a/test/audio/timestamp.h b/test/audio/timestamp.h
index ec42a55ec4a..61c54d9e1b1 100644
--- a/test/audio/timestamp.h
+++ b/test/audio/timestamp.h
@@ -2,8 +2,6 @@
 
 #include "audio/timestamp.h"
 
-#include <limits.h>
-
 class TimestampTestSuite : public CxxTest::TestSuite
 {
 	public:

More information about the Scummvm-git-logs mailing list