[Scummvm-git-logs] scummvm-tools master -> a1d4f57abae8ba7153467fc52748944b7e40b8bb

[lephilousophe]

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

Summary:
a1d4f57aba COMMON: Add nullptr_t check for MacOSX i386


Commit: a1d4f57abae8ba7153467fc52748944b7e40b8bb
    https://github.com/scummvm/scummvm-tools/commit/a1d4f57abae8ba7153467fc52748944b7e40b8bb
Author: Le Philousophe (lephilousophe at users.noreply.github.com)
Date: 2023-01-02T17:17:50+01:00

Commit Message:
COMMON: Add nullptr_t check for MacOSX i386

Changed paths:
    common/scummsys.h
    configure


diff --git a/common/scummsys.h b/common/scummsys.h
index 1b7e23a5..53c50dec 100644
--- a/common/scummsys.h
+++ b/common/scummsys.h
@@ -506,5 +506,13 @@
 #endif
 #endif
 
+//
+// std::nullptr_t when this type is not available
+//
+#if defined(NO_CXX11_NULLPTR_T)
+namespace std {
+	typedef decltype(nullptr) nullptr_t;
+}
+#endif
 
 #endif
diff --git a/configure b/configure
index 1ab0ccf3..be15ddd0 100755
--- a/configure
+++ b/configure
@@ -1028,6 +1028,23 @@ android | gamecube | psp | wii)
 	;;
 esac
 
+# Check if std::nullptr_t is available
+echo_n "Checking if C++11 std::nullptr_t is available..."
+cat > $TMPC << EOF
+#include <cstddef>
+int main(int argc, char *argv[]) {
+	std::nullptr_t i = nullptr;
+	return 0;
+}
+EOF
+cc_check
+if test "$TMPR" -eq 0; then
+		echo yes
+else
+		echo no
+		define_in_config_if_yes yes 'NO_CXX11_NULLPTR_T'
+fi
+
 if test -n "$STRINGS"; then
 	_strings=$STRINGS
 else