diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2014-12-21 11:46:28 -0300 |
|---|---|---|
| committer | Juan Linietsky <reduzio@gmail.com> | 2014-12-21 11:46:28 -0300 |
| commit | 78e7777cf5ed721b4802066a769b5ecc0c530c3b (patch) | |
| tree | d2a8f851fd3ec87776b7bddec651d7489533278c /drivers | |
| parent | f7f197c40941ffaf03fcddeb20536dec8074ca00 (diff) | |
| parent | e7c1137d927baf6daefa218b48ac1c891cb356ee (diff) | |
Merge branch 'master' of https://github.com/okamstudio/godot
Conflicts:
modules/gdscript/gd_editor.cpp
Improved code completion for InputEvent (shows members by type)
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/png/pngpriv.h | 6 | ||||
| -rw-r--r-- | drivers/vorbis/os.h | 2 |
2 files changed, 6 insertions, 2 deletions
diff --git a/drivers/png/pngpriv.h b/drivers/png/pngpriv.h index 67e486c577..56532f4eeb 100644 --- a/drivers/png/pngpriv.h +++ b/drivers/png/pngpriv.h @@ -341,7 +341,11 @@ typedef PNG_CONST png_uint_16p FAR * png_const_uint_16pp; # ifdef _WINDOWS_ /* Favor Windows over C runtime fns */ # define CVT_PTR(ptr) (ptr) # define CVT_PTR_NOCHECK(ptr) (ptr) -# define png_strlen lstrlenA +# ifdef WINRT_ENABLED +# define png_strlen strlen +# else +# define png_strlen lstrlenA +# endif # define png_memcmp memcmp # define png_memcpy CopyMemory # define png_memset memset diff --git a/drivers/vorbis/os.h b/drivers/vorbis/os.h index 276b4decc7..3df1d194e9 100644 --- a/drivers/vorbis/os.h +++ b/drivers/vorbis/os.h @@ -120,7 +120,7 @@ static inline int vorbis_ftoi(double f){ /* yes, double! Otherwise, /* MSVC inline assembly. 32 bit only; inline ASM isn't implemented in the * 64 bit compiler */ -#if defined(_MSC_VER) && !defined(_WIN64) && !defined(_WIN32_WCE) +#if defined(_MSC_VER) && !defined(_WIN64) && !defined(_WIN32_WCE) && !defined(WINDOWSPHONE_ENABLED) # define VORBIS_FPU_CONTROL typedef ogg_int16_t vorbis_fpu_control; |