diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2015-12-31 00:33:07 -0300 |
|---|---|---|
| committer | Juan Linietsky <reduzio@gmail.com> | 2015-12-31 00:33:07 -0300 |
| commit | 335c52ba03ecbccd0c9af8f9278b69da09a3e931 (patch) | |
| tree | 5e4f5e2ea0d735228de7733e2fb689abbc2bc9c9 /drivers/webp/utils/bit_reader.h | |
| parent | fd836cad270f7eb9645356cd583c8f11bf737b0f (diff) | |
| parent | ac13c8c0c6fc346462b21ee00139dddd2e4ec1e3 (diff) | |
| download | redot-engine-335c52ba03ecbccd0c9af8f9278b69da09a3e931.tar.gz | |
Merge branch 'master' of https://github.com/godotengine/godot
Diffstat (limited to 'drivers/webp/utils/bit_reader.h')
| -rw-r--r-- | drivers/webp/utils/bit_reader.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/drivers/webp/utils/bit_reader.h b/drivers/webp/utils/bit_reader.h index 7e09653ebc..f0f450231d 100644 --- a/drivers/webp/utils/bit_reader.h +++ b/drivers/webp/utils/bit_reader.h @@ -37,6 +37,12 @@ extern "C" { // BITS can be any multiple of 8 from 8 to 56 (inclusive). // Pick values that fit natural register size. +#ifdef JAVASCRIPT_ENABLED + +#define BITS 16 + +#else + #if defined(__i386__) || defined(_M_IX86) // x86 32bit #define BITS 24 #elif defined(__x86_64__) || defined(_M_X64) // x86 64bit @@ -49,6 +55,8 @@ extern "C" { #define BITS 24 // TODO(skal): test aarch64 and find the proper BITS value. #endif +#endif + //------------------------------------------------------------------------------ // Derived types and constants: // bit_t = natural register type for storing 'value_' (which is BITS+8 bits) |