diff options
author | Juan Linietsky <reduzio@gmail.com> | 2014-02-13 18:03:28 -0300 |
---|---|---|
committer | Juan Linietsky <reduzio@gmail.com> | 2014-02-13 18:03:28 -0300 |
commit | 58cda02a389759d18176216c06f375d364cefef1 (patch) | |
tree | 4102902585d12ea6807ceaee1370136d29b601e1 /drivers/speex | |
parent | 1adc330b68b1f6ca18aac05daf88c7d4d757fd0a (diff) |
-fixed export templates not loading/exporting on Windows
-fixed TouchScreenButton with stretch2d
-fixed(?) OSX crash on startup (test!!)
-compilation fixes on windows
-CollisionPolygon editor works again
-find buttons en find dialog
-TileMap editor cleanup (removed "error", made nicer)
-viewport flicker fixed
-make .scn default extension for saving scenes
-export the rest of the network classes to gdscript
Diffstat (limited to 'drivers/speex')
-rw-r--r-- | drivers/speex/audio_stream_speex.cpp | 2 | ||||
-rw-r--r-- | drivers/speex/speex_header.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/speex/audio_stream_speex.cpp b/drivers/speex/audio_stream_speex.cpp index a4209a4223..a6bac78b4d 100644 --- a/drivers/speex/audio_stream_speex.cpp +++ b/drivers/speex/audio_stream_speex.cpp @@ -7,7 +7,7 @@ static _FORCE_INLINE_ uint16_t le_short(uint16_t s) { uint16_t ret=s; -#ifdef BIG_ENDIAN_ENABLED +#if 0 //def BIG_ENDIAN_ENABLED ret = s>>8; ret += s<<8; #endif diff --git a/drivers/speex/speex_header.c b/drivers/speex/speex_header.c index 2b3fb78396..2792623983 100644 --- a/drivers/speex/speex_header.c +++ b/drivers/speex/speex_header.c @@ -47,7 +47,7 @@ /** Convert little endian */ static SPEEX_INLINE spx_int32_t le_int(spx_int32_t i) { -#if !defined(__LITTLE_ENDIAN__) && ( defined(WORDS_BIGENDIAN) || defined(__BIG_ENDIAN__) || defined(BIG_ENDIAN_ENABLED) ) +#if !defined(__LITTLE_ENDIAN__) && ( defined(WORDS_BIGENDIAN) || defined(__BIG_ENDIAN__) /* || defined(BIG_ENDIAN_ENABLED) */ ) spx_uint32_t ui, ret; ui = i; ret = ui>>24; |