Fixing merge conflict resolution
This commit is contained in:
19
src/types.h
Normal file
19
src/types.h
Normal file
@@ -0,0 +1,19 @@
|
||||
#ifndef TYPES_H_
|
||||
#define TYPES_H_
|
||||
|
||||
#include <stdint.h>
|
||||
|
||||
typedef uint8_t u8;
|
||||
typedef uint16_t u16;
|
||||
typedef uint32_t u32;
|
||||
typedef uint64_t u64;
|
||||
typedef int8_t i8;
|
||||
typedef int16_t i16;
|
||||
typedef int32_t i32;
|
||||
typedef int64_t i64;
|
||||
typedef float f32;
|
||||
typedef double f64;
|
||||
|
||||
typedef enum { HILOAD_OK = 0, HILOAD_FAIL } HiloadResult;
|
||||
|
||||
#endif // TYPES_H_
|
||||
Reference in New Issue
Block a user