diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2011-09-05 20:27:25 +0400 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2011-09-05 20:27:25 +0400 |
| commit | 5a3c6ccadb8925d6e2b1da2b2861de35b33f939f (patch) | |
| tree | ee9b2a9e66c60f10f963399f198a9268b2cc5bc6 /source/blender/blenloader | |
| parent | 4393df93202198b5eaaff438e18060c66b98928d (diff) | |
| parent | 59dbd53e72ae25edf247e49ea1e291af277fecc4 (diff) | |
Merging r39847 through r39930 from trunk into vgroup_modifiers.
Diffstat (limited to 'source/blender/blenloader')
| -rw-r--r-- | source/blender/blenloader/BLO_sys_types.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/blenloader/BLO_sys_types.h b/source/blender/blenloader/BLO_sys_types.h index d56723ec1c5..2114fc34bf1 100644 --- a/source/blender/blenloader/BLO_sys_types.h +++ b/source/blender/blenloader/BLO_sys_types.h @@ -83,7 +83,7 @@ typedef unsigned long uintptr_t; #define _UINTPTR_T_DEFINED #endif -#elif defined(__linux__) || defined(__NetBSD__) +#elif defined(__linux__) || defined(__NetBSD__) || defined(__OpenBSD__) /* Linux-i386, Linux-Alpha, Linux-ppc */ #include <stdint.h> |