Blah merge

This commit is contained in:
Chris Moeller 2015-08-21 04:03:15 +00:00
commit d22043e0f7
2 changed files with 5 additions and 5 deletions

View File

@ -7,14 +7,14 @@
#define _STREAMTYPES_H #define _STREAMTYPES_H
#ifdef _MSC_VER #ifdef _MSC_VER
#if _MSC_VER < 1400 #if (_MSC_VER >= 1600)
#include <pstdint.h>
#define snprintf _snprintf
#else
#include <stdint.h> #include <stdint.h>
#else
#include <pstdint.h>
#endif #endif
#define inline _inline #define inline _inline
#define strcasecmp _stricmp #define strcasecmp _stricmp
#define snprintf _snprintf
#else #else
#include <stdint.h> #include <stdint.h>
#endif #endif

View File

@ -1121,7 +1121,7 @@ int get_vgmstream_frame_size(VGMSTREAM * vgmstream) {
case coding_G7221C: case coding_G7221C:
case coding_G7221: case coding_G7221:
#endif #endif
#ifdef VGM_USE_G719: #ifdef VGM_USE_G719
case coding_G719: case coding_G719:
#endif #endif
#ifdef VGM_USE_MAIATRAC3PLUS #ifdef VGM_USE_MAIATRAC3PLUS