diff options
| author | 2015-01-04 03:18:16 -0500 | |
|---|---|---|
| committer | 2015-01-04 12:34:02 -0500 | |
| commit | 41e1cb12e5060dba37071edb5b511abaf06dc9cf (patch) | |
| tree | b73b2a1f3348cb78c34674a3d705239aaf287ebf /src/core/arm/skyeye_common | |
| parent | Merge pull request #403 from yuriks/shutdown-system (diff) | |
| download | yuzu-41e1cb12e5060dba37071edb5b511abaf06dc9cf.tar.gz yuzu-41e1cb12e5060dba37071edb5b511abaf06dc9cf.tar.xz yuzu-41e1cb12e5060dba37071edb5b511abaf06dc9cf.zip | |
skyeye: Remove duplicate typedefs
citra already has its own typedefs like this.
Diffstat (limited to 'src/core/arm/skyeye_common')
| -rw-r--r-- | src/core/arm/skyeye_common/skyeye_types.h | 30 |
1 files changed, 3 insertions, 27 deletions
diff --git a/src/core/arm/skyeye_common/skyeye_types.h b/src/core/arm/skyeye_common/skyeye_types.h index e7f022f19..fc7d8d922 100644 --- a/src/core/arm/skyeye_common/skyeye_types.h +++ b/src/core/arm/skyeye_common/skyeye_types.h | |||
| @@ -22,34 +22,10 @@ | |||
| 22 | * 12/16/2006 Michael.Kang <blackfin.kang@gmail.com> | 22 | * 12/16/2006 Michael.Kang <blackfin.kang@gmail.com> |
| 23 | */ | 23 | */ |
| 24 | 24 | ||
| 25 | #ifndef __SKYEYE_TYPES_H | 25 | #pragma once |
| 26 | #define __SKYEYE_TYPES_H | ||
| 27 | 26 | ||
| 28 | #include <stdint.h> | 27 | #include <cstdint> |
| 29 | |||
| 30 | /*default machine word length */ | ||
| 31 | |||
| 32 | #ifndef __BEOS__ | ||
| 33 | /* To avoid the type conflict with the qemu */ | ||
| 34 | #ifndef QEMU | ||
| 35 | typedef uint8_t uint8; | ||
| 36 | typedef uint16_t uint16; | ||
| 37 | typedef uint32_t uint32; | ||
| 38 | typedef uint64_t uint64; | ||
| 39 | |||
| 40 | typedef int8_t sint8; | ||
| 41 | typedef int16_t sint16; | ||
| 42 | typedef int32_t sint32; | ||
| 43 | typedef int64_t sint64; | ||
| 44 | #endif | ||
| 45 | 28 | ||
| 46 | typedef uint32_t address_t; | 29 | typedef uint32_t address_t; |
| 47 | typedef uint32_t uinteger_t; | ||
| 48 | typedef int32_t integer_t; | ||
| 49 | |||
| 50 | typedef uint32_t physical_address_t; | 30 | typedef uint32_t physical_address_t; |
| 51 | typedef uint32_t generic_address_t; | 31 | typedef uint32_t generic_address_t; |
| 52 | |||
| 53 | #endif | ||
| 54 | |||
| 55 | #endif | ||