Remove Common/stdtypes.h

This commit is contained in:
zilmar 2021-04-12 16:04:26 +09:30
parent 63a5b5c431
commit 62d2755300
43 changed files with 45 additions and 68 deletions

View File

@ -1,6 +1,6 @@
#pragma once #pragma once
#include <string> #include <string>
#include <Common/stdtypes.h> #include <stdint.h>
enum UISettingID enum UISettingID
{ {

View File

@ -1,8 +1,7 @@
// Common controller plugin specification, version 1.1 // Common controller plugin specification, version 1.1
#pragma once #pragma once
#include <stdint.h>
#include <Common/stdtypes.h>
enum { PLUGIN_TYPE_CONTROLLER = 4 }; enum { PLUGIN_TYPE_CONTROLLER = 4 };

View File

@ -5,7 +5,7 @@
// GNU/GPLv2 licensed: https://gnu.org/licenses/gpl-2.0.html // GNU/GPLv2 licensed: https://gnu.org/licenses/gpl-2.0.html
#pragma once #pragma once
#include <Common/stdtypes.h> #include <stdint.h>
#include "Rsp.h" #include "Rsp.h"
#include "ucodes.h" #include "ucodes.h"

View File

@ -1,4 +1,4 @@
#include <Common/stdtypes.h> #include <stdint.h>
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
#include "Version.h" #include "Version.h"

View File

@ -1,5 +1,5 @@
#pragma once #pragma once
#include "stdtypes.h" #include <stdint.h>
class CDateTime class CDateTime
{ {

View File

@ -1,6 +1,5 @@
#pragma once #pragma once
#include <stdint.h>
#include "stdtypes.h"
class CFileBase class CFileBase
{ {

View File

@ -1,5 +1,5 @@
#pragma once #pragma once
#include "stdtypes.h" #include <stdint.h>
class HighResTimeStamp class HighResTimeStamp
{ {

View File

@ -2,7 +2,7 @@
// This class implements the Lehmer Random Number Generator // This class implements the Lehmer Random Number Generator
#pragma once #pragma once
#include <Common/stdtypes.h> #include <stdint.h>
class CRandom class CRandom
{ {

View File

@ -1,5 +1,5 @@
#pragma once #pragma once
#include "stdtypes.h" #include <stdint.h>
class SyncEvent class SyncEvent
{ {

View File

@ -1,5 +1,5 @@
#pragma once #pragma once
#include <Common/stdtypes.h> #include <stdint.h>
class CThread class CThread
{ {

View File

@ -1,5 +1,5 @@
#pragma once #pragma once
#include "stdtypes.h" #include <stdint.h>
class pjutil class pjutil
{ {

View File

@ -1,6 +1,6 @@
#pragma once #pragma once
#include <string> #include <string>
#include "stdtypes.h" #include <stdint.h>
class CPath class CPath
{ {

View File

@ -1,18 +0,0 @@
#pragma once
// Some versions of Microsoft Visual C/++ compilers before Visual Studio 2010
// have <stdint.h> removed in favor of these non-standard built-in types:
#if defined(_MSC_VER) && (_MSC_VER < 1600)
typedef signed __int8 int8_t;
typedef signed __int16 int16_t;
typedef signed __int32 int32_t;
typedef signed __int64 int64_t;
typedef unsigned __int8 uint8_t;
typedef unsigned __int16 uint16_t;
typedef unsigned __int32 uint32_t;
typedef unsigned __int64 uint64_t;
#else
#include <stdint.h>
#endif

View File

@ -11,7 +11,7 @@ the plugin.
**********************************************************************************/ **********************************************************************************/
#pragma once #pragma once
#include <Common/stdtypes.h> #include <stdint.h>
enum { PLUGIN_TYPE_AUDIO = 3 }; enum { PLUGIN_TYPE_AUDIO = 3 };

View File

@ -1,6 +1,6 @@
#include "stdafx.h" #include "stdafx.h"
#include <stdio.h> #include <stdio.h>
#include <Common/stdtypes.h> #include <stdint.h>
#include <Common/path.h> #include <Common/path.h>
CLanguage * g_Lang = NULL; CLanguage * g_Lang = NULL;

View File

@ -1,10 +1,10 @@
#pragma once #pragma once
#pragma warning(disable:4786) #pragma warning(disable:4786)
#include <string> //stl string #include <string>
#include <map> //stl map #include <map>
#include <list> //stl list #include <list>
#include <Common/stdtypes.h> #include <stdint.h>
typedef std::map<int32_t, std::string, std::less<int32_t> > LANG_STRINGS; typedef std::map<int32_t, std::string, std::less<int32_t> > LANG_STRINGS;
typedef LANG_STRINGS::value_type LANG_STR; typedef LANG_STRINGS::value_type LANG_STR;

View File

@ -1,5 +1,5 @@
#pragma once #pragma once
#include <Common/stdtypes.h> #include <stdint.h>
#include <string> #include <string>
#include <vector> #include <vector>

View File

@ -1,7 +1,6 @@
// Based from MAME's N64DD driver code by Happy_ // Based from MAME's N64DD driver code by Happy_
#pragma once #pragma once
#include <stdint.h>
#include <Common/stdtypes.h>
void DiskCommand(void); void DiskCommand(void);
void DiskReset(void); void DiskReset(void);

View File

@ -1,7 +1,7 @@
#pragma once #pragma once
#include <stddef.h> #include <stddef.h>
#include <Common/stdtypes.h> #include <stdint.h>
struct gb_cart struct gb_cart
{ {

View File

@ -1,7 +1,7 @@
#pragma once #pragma once
#include <Project64-core/N64System/N64Types.h> #include <Project64-core/N64System/N64Types.h>
#include <Common/stdtypes.h> #include <stdint.h>
class CN64Disk class CN64Disk
{ {

View File

@ -1,6 +1,5 @@
#pragma once #pragma once
#include <stdint.h>
#include <Common/stdtypes.h>
/* /*
* The limits of COP1 extend to native SSE2 register capabilities, but for * The limits of COP1 extend to native SSE2 register capabilities, but for

View File

@ -2,7 +2,7 @@
#include <Project64-core/Settings.h> #include <Project64-core/Settings.h>
#include <Common/StdString.h> #include <Common/StdString.h>
#include <Common/stdtypes.h> #include <stdint.h>
enum SettingType enum SettingType
{ {

View File

@ -1,7 +1,7 @@
#include <string.h> #include <string.h>
#include <Common/MemTest.h> #include <Common/MemTest.h>
#include <Common/stdtypes.h> #include <stdint.h>
#include <Common/StdString.h> #include <Common/StdString.h>
#include <Common/Trace.h> #include <Common/Trace.h>

View File

@ -1,5 +1,5 @@
#pragma once #pragma once
#include <Common/stdtypes.h> #include <stdint.h>
#include <guiddef.h> #include <guiddef.h>
enum BtnType enum BtnType

View File

@ -2,8 +2,7 @@
Project64 Controller plugin spec, version #1.1 Project64 Controller plugin spec, version #1.1
**********************************************************************************/ **********************************************************************************/
#pragma once #pragma once
#include <stdint.h>
#include <Common/stdtypes.h>
enum { PLUGIN_TYPE_CONTROLLER = 4 }; enum { PLUGIN_TYPE_CONTROLLER = 4 };

View File

@ -4,7 +4,7 @@
#include "wtl-BitmapPicture.h" #include "wtl-BitmapPicture.h"
#include "wtl-ScanButton.h" #include "wtl-ScanButton.h"
#include "OptionsUI.h" #include "OptionsUI.h"
#include <Common/stdtypes.h> #include <stdint.h>
#include <Common/StdString.h> #include <Common/StdString.h>
#include "resource.h" #include "resource.h"

View File

@ -1,5 +1,5 @@
#pragma once #pragma once
#include <Common/stdtypes.h> #include <stdint.h>
#include <string> #include <string>
#include "N64Controller.h" #include "N64Controller.h"
#include "ControllerSpec1.1.h" #include "ControllerSpec1.1.h"

View File

@ -1,5 +1,5 @@
#pragma once #pragma once
#include <Common/stdtypes.h> #include <stdint.h>
#include "ControllerSpec1.1.h" #include "ControllerSpec1.1.h"
#include "N64Controller.h" #include "N64Controller.h"

View File

@ -6,7 +6,7 @@
#pragma once #pragma once
#include <Project64-video/Renderer/types.h> #include <Project64-video/Renderer/types.h>
#include <Common/stdtypes.h> #include <stdint.h>
#define NO_OPTIONS 0x00000000 #define NO_OPTIONS 0x00000000

View File

@ -4,7 +4,7 @@
// Copyright(C) 2003-2009 Sergey 'Gonetz' Lipski // Copyright(C) 2003-2009 Sergey 'Gonetz' Lipski
// Copyright(C) 2002 Dave2001 // Copyright(C) 2002 Dave2001
// GNU/GPLv2 licensed: https://gnu.org/licenses/gpl-2.0.html // GNU/GPLv2 licensed: https://gnu.org/licenses/gpl-2.0.html
#include <Common/stdtypes.h> #include <stdint.h>
#include <string.h> #include <string.h>
typedef uint32_t uint32_t; typedef uint32_t uint32_t;

View File

@ -6,7 +6,7 @@
// GNU/GPLv2 licensed: https://gnu.org/licenses/gpl-2.0.html // GNU/GPLv2 licensed: https://gnu.org/licenses/gpl-2.0.html
#pragma once #pragma once
#include <Common/stdtypes.h> #include <stdint.h>
typedef uint8_t gfxAlpha_t; typedef uint8_t gfxAlpha_t;
typedef uint32_t gfxColor_t; typedef uint32_t gfxColor_t;

View File

@ -1,5 +1,5 @@
#pragma once #pragma once
#include <Common/stdtypes.h> #include <stdint.h>
#ifdef ANDROID #ifdef ANDROID
void UpdateScreenResolution(int ScreenWidth, int ScreenHeight); void UpdateScreenResolution(int ScreenWidth, int ScreenHeight);

View File

@ -5,7 +5,7 @@
// Copyright(C) 2003 Rice1964 // Copyright(C) 2003 Rice1964
// GNU/GPLv2 licensed: https://gnu.org/licenses/gpl-2.0.html // GNU/GPLv2 licensed: https://gnu.org/licenses/gpl-2.0.html
#pragma once #pragma once
#include <Common/stdtypes.h> #include <stdint.h>
#define NO_OPTIONS 0x00000000 #define NO_OPTIONS 0x00000000

View File

@ -19,7 +19,7 @@
#define TAPIENTRY #define TAPIENTRY
#endif #endif
#include <Common/stdtypes.h> #include <stdint.h>
typedef uint8_t uint8; typedef uint8_t uint8;
typedef uint16_t uint16; typedef uint16_t uint16;

View File

@ -10,7 +10,7 @@
#include <assert.h> #include <assert.h>
#include <stdio.h> #include <stdio.h>
#include <Common/stdtypes.h> #include <stdint.h>
#include "types.h" #include "types.h"
#include "internal.h" #include "internal.h"

View File

@ -6,8 +6,8 @@
// GNU/GPLv2 licensed: https://gnu.org/licenses/gpl-2.0.html // GNU/GPLv2 licensed: https://gnu.org/licenses/gpl-2.0.html
#pragma once #pragma once
#include <Common/stdtypes.h>
#include <Project64-video/Renderer/Renderer.h> #include <Project64-video/Renderer/Renderer.h>
#include <stdint.h>
extern char out_buf[2048]; extern char out_buf[2048];

View File

@ -1,6 +1,6 @@
#pragma once #pragma once
#include <string> #include <string>
#include <Common/stdtypes.h> #include <stdint.h>
enum UISettingID enum UISettingID
{ {

View File

@ -1,5 +1,5 @@
#pragma once #pragma once
#include <Common/stdtypes.h> #include <stdint.h>
#include <map> #include <map>
class CBreakpoints : class CBreakpoints :

View File

@ -11,7 +11,7 @@
#include <string.h> #include <string.h>
#include <Common/StdString.h> #include <Common/StdString.h>
#include <Common/stdtypes.h> #include <stdint.h>
#include "../Settings/Settings.h" #include "../Settings/Settings.h"
extern "C" { extern "C" {

View File

@ -4,7 +4,7 @@
extern "C" { extern "C" {
#endif #endif
#include <Common/stdtypes.h> #include <stdint.h>
#include "Types.h" #include "Types.h"
#if defined(_WIN32) #if defined(_WIN32)

View File

@ -1,7 +1,7 @@
#ifndef __Types_h #ifndef __Types_h
#define __Types_h #define __Types_h
#include <Common/stdtypes.h> #include <stdint.h>
// Pointer to RSP operation code functions or "func" // Pointer to RSP operation code functions or "func"
// This is the type of all RSP interpreter and recompiler functions // This is the type of all RSP interpreter and recompiler functions

View File

@ -1,6 +1,6 @@
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
#include <Common/stdtypes.h> #include <stdint.h>
#include "Rsp.h" #include "Rsp.h"
#include "RSP Registers.h" #include "RSP Registers.h"

View File

@ -1,6 +1,6 @@
#include <Settings/Settings.h> #include <Settings/Settings.h>
#include <Common/Platform.h> #include <Common/Platform.h>
#include <Common/stdtypes.h> #include <stdint.h>
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>