projects / packages / celestia.git / blame
| Commit | Line | Data |
|---|---|---|
| e11c2ee1 JK |
1 | diff -dur -x '*~' celestia-1.6.1.orig/src/celutil/basictypes.h celestia-1.6.1/src/celutil/basictypes.h |
| 2 | --- celestia-1.6.1.orig/src/celutil/basictypes.h 2011-06-05 18:11:15.000000000 +0200 | |
| 3 | +++ celestia-1.6.1/src/celutil/basictypes.h 2015-07-10 19:09:08.546551326 +0200 | |
| 4 | @@ -10,34 +10,19 @@ | |
| 5 | #ifndef _BASICTYPES_H_ | |
| 6 | #define _BASICTYPES_H_ | |
| 7 | ||
| 8 | +#include <stdint.h> | |
| 9 | + | |
| 10 | typedef unsigned int uint; | |
| 11 | ||
| 12 | // Fixed size types | |
| 13 | -typedef int int32; | |
| 14 | -typedef unsigned int uint32; | |
| 15 | -typedef short int16; | |
| 16 | -typedef unsigned short uint16; | |
| 17 | -typedef char int8; | |
| 18 | -typedef unsigned char uint8; | |
| 19 | - | |
| 20 | -#ifdef _MSC_VER | |
| 21 | -// MS Visual C++ does not include stdint.h | |
| 22 | -typedef __int64 int64; | |
| 23 | -typedef unsigned __int64 uint64; | |
| 24 | -#define INT64_MAX LLONG_MAX | |
| 25 | -#define UINT64_MAX ULLONG_MAX | |
| 26 | -#else | |
| 27 | -#include <stdint.h> | |
| 28 | -#include <limits> | |
| 29 | -typedef int64_t int64; | |
| 30 | -typedef uint64_t uint64; | |
| 31 | -#define INT64_MAX 9223372036854775807LL | |
| 32 | -#ifndef UINT64_MAX | |
| 33 | -#define UINT64_MAX 0xffffffffffffffffULL | |
| 34 | -#endif | |
| 35 | -//#define INT64_MAX std::numeric_limits<int64_t>::max() | |
| 36 | -//#define UINT64_MAX std::numeric_limits<uint64_t>::max() | |
| 37 | -#endif | |
| 38 | +typedef int32_t int32; | |
| 39 | +typedef uint32_t uint32; | |
| 40 | +typedef int16_t int16; | |
| 41 | +typedef uint16_t uint16; | |
| 42 | +typedef int8_t int8; | |
| 43 | +typedef uint8_t uint8; | |
| 44 | +typedef int64_t int64; | |
| 45 | +typedef uint64_t uint64; | |
| 46 | ||
| 47 | #endif // _BASICTYPES_H_ | |
| 48 |