ref: b2066e1dc2c93b00400acfed1ef9ea041a0cf832
parent: 50a74382f0208e2b42ab01eda11b47b573f06134
author: Ethan Hugg <[email protected]>
date: Thu Dec 19 06:27:05 EST 2013
Move -Werror to platform file. Also, %zu can't be used on Windows.
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,5 +9,5 @@
- sudo apt-get update -qq
- sudo apt-get install -qq g++-4.6-multilib gcc-multilib libc6-dev-i386 lib32z1-dev
install: make gtest-bootstrap
-script: make WERROR=Yes && make test && make clean && make WERROR=Yes ENABLE64BIT=Yes && make test
+script: make && make test && make clean && make ENABLE64BIT=Yes && make test
--- a/Makefile
+++ b/Makefile
@@ -17,10 +17,9 @@
USE_ASM = Yes
endif
else
-CFLAGS += -g
+CFLAGS = -g
USE_ASM = No
endif
-
ifeq ($(ENABLE64BIT), Yes)
CFLAGS += -m64
LDFLAGS += -m64
@@ -28,11 +27,6 @@
CFLAGS += -m32
LDFLAGS += -m32
endif
-
-ifeq ($(WERROR), Yes)
-CFLAGS += -Werror
-endif
-
include build/platform-$(UNAME).mk
ifeq ($(USE_ASM),Yes)
--- a/build/platform-linux.mk
+++ b/build/platform-linux.mk
@@ -1,5 +1,5 @@
ASM = nasm
-CFLAGS += -fPIC -DLINUX -D__NO_CTYPE
+CFLAGS += -Werror -fPIC -DLINUX -D__NO_CTYPE
LDFLAGS += -lpthread
ASMFLAGS += -f elf
--- a/codec/encoder/core/src/encoder_ext.cpp
+++ b/codec/encoder/core/src/encoder_ext.cpp
@@ -2123,9 +2123,9 @@
}
#if defined(MEMORY_MONITOR)
- WelsLog (pCtx, WELS_LOG_INFO, "WelsInitEncoderExt() exit, overall memory usage: %zu bytes\n",
- sizeof (sWelsEncCtx) /* requested size from malloc() or new operator */
- + pCtx->pMemAlign->WelsGetMemoryUsage() /* requested size from CMemoryAlign::WelsMalloc() */
+ WelsLog (pCtx, WELS_LOG_INFO, "WelsInitEncoderExt() exit, overall memory usage: %u bytes\n",
+ static_cast<unsigned int>(sizeof (sWelsEncCtx) /* requested size from malloc() or new operator */
+ + pCtx->pMemAlign->WelsGetMemoryUsage()) /* requested size from CMemoryAlign::WelsMalloc() */
);
#endif//MEMORY_MONITOR