diff options
| author | Sybren A. Stüvel <sybren@stuvel.eu> | 2017-02-08 15:10:16 +0300 |
|---|---|---|
| committer | Sybren A. Stüvel <sybren@stuvel.eu> | 2017-02-08 15:10:16 +0300 |
| commit | d4913af84660318047e3404f9766014cd78864ab (patch) | |
| tree | 216516057dc8df5177e4f179392de5a79811ba3f /source/blender/blenlib/BLI_sys_types.h | |
| parent | c973e8d2da5cf3f615256269128a07390f8c06a9 (diff) | |
| parent | 8cda364d6f2e6e8da454034f19fb959739045813 (diff) | |
Merge branch 'master' into blender2.8
# Conflicts:
# source/blender/blenloader/intern/writefile.c
Diffstat (limited to 'source/blender/blenlib/BLI_sys_types.h')
| -rw-r--r-- | source/blender/blenlib/BLI_sys_types.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/source/blender/blenlib/BLI_sys_types.h b/source/blender/blenlib/BLI_sys_types.h index 7929e1d6551..9d8222c575d 100644 --- a/source/blender/blenlib/BLI_sys_types.h +++ b/source/blender/blenlib/BLI_sys_types.h @@ -80,6 +80,11 @@ typedef uint64_t u_int64_t; #include <stddef.h> /* size_t define */ #include <stdbool.h> +typedef unsigned int uint; +typedef unsigned short ushort; +typedef unsigned long ulong; +typedef unsigned char uchar; + #ifdef __cplusplus } #endif |