Reverted DJRobX's changes with regards to stdint.h

BTW: Nach has placed a copy of the header here:
https://zsnes.bountysource.com/svn/!dirinfo/5168/trunk/src/win/vc_head

git-svn-id: https://svn.code.sf.net/p/vbam/code/trunk@85 a31d4220-a93d-0410-bf67-fe4944624d44
This commit is contained in:
mudlord 2007-11-15 11:54:51 +00:00
parent 85ef110281
commit e1e06a95a2
4 changed files with 5 additions and 25 deletions

View File

@ -20,9 +20,7 @@
#ifndef VBA_SYSTEM_H #ifndef VBA_SYSTEM_H
#define VBA_SYSTEM_H #define VBA_SYSTEM_H
#ifndef _MSC_VER
#include <stdint.h> #include <stdint.h>
#endif
#include "unzip.h" #include "unzip.h"
@ -30,7 +28,7 @@
#define NULL 0 #define NULL 0
#endif #endif
#ifndef _MSC_VER
typedef uint8_t u8; typedef uint8_t u8;
typedef uint16_t u16; typedef uint16_t u16;
typedef uint32_t u32; typedef uint32_t u32;
@ -41,13 +39,7 @@ typedef int16_t s16;
typedef int32_t s32; typedef int32_t s32;
typedef int64_t s64; typedef int64_t s64;
#else
typedef unsigned __int64 u64;
typedef signed char s8;
typedef signed short s16;
typedef signed int s32;
typedef signed __int64 s64;
#endif
typedef unsigned char u8; typedef unsigned char u8;
typedef unsigned short u16; typedef unsigned short u16;

View File

@ -18,12 +18,7 @@
#include "Util.h" #include "Util.h"
#define __STDC_CONSTANT_MACROS #define __STDC_CONSTANT_MACROS
#ifndef _MSC_VER
#include <stdint.h> #include <stdint.h>
#else
typedef unsigned int uint32_t;
#endif
extern "C" extern "C"
{ {

View File

@ -19,12 +19,9 @@
#include "hq_shared32.h" #include "hq_shared32.h"
#define __STDC_CONSTANT_MACROS #define __STDC_CONSTANT_MACROS
#ifndef _MSC_VER
#include <stdint.h> #include <stdint.h>
#else
typedef unsigned __int64 uint64_t;
#define UINT64_C(x) x;
#endif
const uint64_t reg_blank = UINT64_C(0x0000000000000000); const uint64_t reg_blank = UINT64_C(0x0000000000000000);
const uint64_t const7 = UINT64_C(0x0000000700070007); const uint64_t const7 = UINT64_C(0x0000000700070007);

View File

@ -33,12 +33,8 @@
#define __STDC_CONSTANT_MACROS #define __STDC_CONSTANT_MACROS
#ifndef _MSC_VER
#include <stdint.h> #include <stdint.h>
#else
typedef unsigned short uint16_t;
typedef unsigned int uint32_t;
#endif
typedef uint16_t interp_uint16; typedef uint16_t interp_uint16;
typedef uint32_t interp_uint32; typedef uint32_t interp_uint32;