[Scummvm-git-logs] scummvm master -> 7347a82df2466f717afc9721aeeff8d3d14460d1

[bluegr]

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:
7347a82df2 COMMON: Remove inttypes.h


Commit: 7347a82df2466f717afc9721aeeff8d3d14460d1
    https://github.com/scummvm/scummvm/commit/7347a82df2466f717afc9721aeeff8d3d14460d1
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2024-07-04T00:03:15+03:00

Commit Message:
COMMON: Remove inttypes.h

It contains defines that should be available from scummsys.h.
Also, it contains defines to support ancient and
now unsupported versions of MSVC (2013 and earlier)

Changed paths:
  R common/inttypes.h
    audio/decoders/ac3.cpp
    audio/decoders/apc.cpp
    audio/mods/universaltracker.cpp
    image/codecs/mpeg.cpp


diff --git a/audio/decoders/ac3.cpp b/audio/decoders/ac3.cpp
index bba80daf848..26ec636b2b9 100644
--- a/audio/decoders/ac3.cpp
+++ b/audio/decoders/ac3.cpp
@@ -19,7 +19,6 @@
  *
  */
 
-#include "common/inttypes.h"
 #include "common/ptr.h"
 #include "common/stream.h"
 #include "common/textconsole.h"
diff --git a/audio/decoders/apc.cpp b/audio/decoders/apc.cpp
index 5429e03feee..cc5bdcec237 100644
--- a/audio/decoders/apc.cpp
+++ b/audio/decoders/apc.cpp
@@ -19,7 +19,6 @@
  *
  */
 
-#include "common/inttypes.h"
 #include "common/ptr.h"
 #include "common/stream.h"
 #include "common/textconsole.h"
diff --git a/audio/mods/universaltracker.cpp b/audio/mods/universaltracker.cpp
index cdf31ce326d..0066fadaf9a 100644
--- a/audio/mods/universaltracker.cpp
+++ b/audio/mods/universaltracker.cpp
@@ -33,7 +33,6 @@
 #define FORBIDDEN_SYMBOL_EXCEPTION_longjmp
 #endif
 
-#include "common/inttypes.h"
 #include "common/ptr.h"
 #include "common/stream.h"
 #include "common/textconsole.h"
diff --git a/common/inttypes.h b/common/inttypes.h
deleted file mode 100644
index 52b68ad9dbb..00000000000
--- a/common/inttypes.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program 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 3 of the License, or
- * (at your option) any later version.
- *
- * This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-#ifndef COMMON_INTTYPES_H
-#define COMMON_INTTYPES_H
-
-#if (defined(_MSC_VER) && _MSC_VER < 1800)
-	typedef signed char int8_t;
-	typedef signed short int16_t;
-	typedef unsigned char uint8_t;
-	typedef unsigned short uint16_t;
-	#if !defined(SDL_COMPILEDVERSION) || (SDL_COMPILEDVERSION < 1210)
-	typedef signed long int32_t;
-	typedef unsigned long uint32_t;
-	#endif
-#else
-#	include <inttypes.h>
-#endif
-
-#endif
diff --git a/image/codecs/mpeg.cpp b/image/codecs/mpeg.cpp
index c708bd3ee3e..6dd4409815e 100644
--- a/image/codecs/mpeg.cpp
+++ b/image/codecs/mpeg.cpp
@@ -20,7 +20,6 @@
  */
 
 #include "common/debug.h"
-#include "common/inttypes.h"
 #include "common/stream.h"
 #include "common/system.h"
 #include "common/textconsole.h"