diff options
author | Campbell Barton <ideasman42@gmail.com> | 2021-06-10 14:05:50 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2021-06-10 14:10:28 +0300 |
commit | 1a72ee4cbe055b0ad28dc3eeff9e4665ee64b37b (patch) | |
tree | f09c65501fc9938b9aa499678b7d0a3f3a760eae /source/blender/blenkernel | |
parent | e4ef8cbf7e4f270dc6027fb9261de5678bbe1c2d (diff) |
Cleanup: move endian values from BKE_global into BLI_endian_defines
This change was prompted by D6408 which moves thumbnail extraction into
a shared function that happens use these endian defines but only links
blenlib.
There is no need for these defines to be associated with globals
so move into their own header.
Diffstat (limited to 'source/blender/blenkernel')
-rw-r--r-- | source/blender/blenkernel/BKE_global.h | 14 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/customdata_file.c | 2 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/writeffmpeg.c | 1 |
3 files changed, 2 insertions, 15 deletions
diff --git a/source/blender/blenkernel/BKE_global.h b/source/blender/blenkernel/BKE_global.h index 9e237679795..74f2bf7c6ad 100644 --- a/source/blender/blenkernel/BKE_global.h +++ b/source/blender/blenkernel/BKE_global.h @@ -199,20 +199,6 @@ enum { */ #define G_FILE_FLAG_ALL_RUNTIME (G_FILE_NO_UI | G_FILE_RECOVER_READ | G_FILE_RECOVER_WRITE) -/** ENDIAN_ORDER: indicates what endianness the platform where the file was written had. */ -#if !defined(__BIG_ENDIAN__) && !defined(__LITTLE_ENDIAN__) -# error Either __BIG_ENDIAN__ or __LITTLE_ENDIAN__ must be defined. -#endif - -#define L_ENDIAN 1 -#define B_ENDIAN 0 - -#ifdef __BIG_ENDIAN__ -# define ENDIAN_ORDER B_ENDIAN -#else -# define ENDIAN_ORDER L_ENDIAN -#endif - /** #Global.moving, signals drawing in (3d) window to denote transform */ enum { G_TRANSFORM_OBJ = (1 << 0), diff --git a/source/blender/blenkernel/intern/customdata_file.c b/source/blender/blenkernel/intern/customdata_file.c index 4aaecc26eff..314d5f4ff82 100644 --- a/source/blender/blenkernel/intern/customdata_file.c +++ b/source/blender/blenkernel/intern/customdata_file.c @@ -24,13 +24,13 @@ #include "MEM_guardedalloc.h" +#include "BLI_endian_defines.h" #include "BLI_endian_switch.h" #include "BLI_fileops.h" #include "BLI_string.h" #include "BLI_utildefines.h" #include "BKE_customdata_file.h" -#include "BKE_global.h" /************************* File Format Definitions ***************************/ diff --git a/source/blender/blenkernel/intern/writeffmpeg.c b/source/blender/blenkernel/intern/writeffmpeg.c index 92d19f18a93..560ae30967f 100644 --- a/source/blender/blenkernel/intern/writeffmpeg.c +++ b/source/blender/blenkernel/intern/writeffmpeg.c @@ -36,6 +36,7 @@ # include <AUD_Special.h> # endif +# include "BLI_endian_defines.h" # include "BLI_math_base.h" # include "BLI_threads.h" # include "BLI_utildefines.h" |