mirror of
https://github.com/libretro/scummvm.git
synced 2025-03-03 16:58:26 +00:00
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)
This commit is contained in:
parent
6777f200f9
commit
7347a82df2
@ -19,7 +19,6 @@
|
|||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "common/inttypes.h"
|
|
||||||
#include "common/ptr.h"
|
#include "common/ptr.h"
|
||||||
#include "common/stream.h"
|
#include "common/stream.h"
|
||||||
#include "common/textconsole.h"
|
#include "common/textconsole.h"
|
||||||
|
@ -19,7 +19,6 @@
|
|||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "common/inttypes.h"
|
|
||||||
#include "common/ptr.h"
|
#include "common/ptr.h"
|
||||||
#include "common/stream.h"
|
#include "common/stream.h"
|
||||||
#include "common/textconsole.h"
|
#include "common/textconsole.h"
|
||||||
|
@ -33,7 +33,6 @@
|
|||||||
#define FORBIDDEN_SYMBOL_EXCEPTION_longjmp
|
#define FORBIDDEN_SYMBOL_EXCEPTION_longjmp
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include "common/inttypes.h"
|
|
||||||
#include "common/ptr.h"
|
#include "common/ptr.h"
|
||||||
#include "common/stream.h"
|
#include "common/stream.h"
|
||||||
#include "common/textconsole.h"
|
#include "common/textconsole.h"
|
||||||
|
@ -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
|
|
@ -20,7 +20,6 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
#include "common/debug.h"
|
#include "common/debug.h"
|
||||||
#include "common/inttypes.h"
|
|
||||||
#include "common/stream.h"
|
#include "common/stream.h"
|
||||||
#include "common/system.h"
|
#include "common/system.h"
|
||||||
#include "common/textconsole.h"
|
#include "common/textconsole.h"
|
||||||
|
Loading…
x
Reference in New Issue
Block a user