ref: e87cf9e2775e4212ff25cea4676e1205b6eb07e7
parent: 469419bfb4cf1aba6550114795b4d8615927aa3c
parent: 1e5a290855f40201afd73f0313ee38bc5abbd336
author: Andreas Gal <andreas.gal@gmail.com>
date: Thu Jan 2 01:25:01 EST 2014
Merge pull request #90 from ruil2/new_request fix mingw build issue
--- a/build/platform-mingw_nt.mk
+++ b/build/platform-mingw_nt.mk
@@ -1,5 +1,5 @@
ASM = nasm
CFLAGS += -DWIN32 -D__NO_CTYPE
LDFLAGS +=
-ASMFLAGS += -f win -DPREFIX
+ASMFLAGS += -f win32 -DPREFIX
--- a/codec/decoder/core/inc/utils.h
+++ b/codec/decoder/core/inc/utils.h
@@ -48,9 +48,6 @@
namespace WelsDec {-#ifdef __cplusplus
-extern "C" {-#endif//__cplusplus
// cache line size
extern uint32_t g_uiCacheLineSize;
@@ -91,9 +88,7 @@
WELS_LOG_DEFAULT = WELS_LOG_ERROR | WELS_LOG_WARNING | WELS_LOG_INFO | WELS_LOG_DEBUG // Default log level in Wels codec
};
-#ifdef __cplusplus
-}
-#endif//__cplusplus
+
} // namespace WelsDec