Fix compilation with clang 3.8

tarantool · May 12, 2016 · 18b5408 · 18b5408
1 parent 8bd11fe
commit 18b5408
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 7 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -5,10 +5,12 @@ if(NOT CMAKE_BUILD_TYPE)
     set(CMAKE_BUILD_TYPE Debug)
 endif()
 
-set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c99 -Wall -Wextra")
-set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -O0 -Werror")
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra")
-set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -O0 -Werror")
+if(NOT DEFINED SMALL_EMBEDDED)
+    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c99 -Wall -Wextra")
+    set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -O0 -Werror")
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra")
+    set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -O0 -Werror")
+endif()
 
 # Enable GNU glibc extentions.
 add_definitions("-D_GNU_SOURCE")

diff --git a/test/unit.h b/test/unit.h
@@ -104,7 +104,6 @@ int check_plan(void);
 		_space(stderr);			\
 		fprintf(stderr, "#   in %s at line %d\n", __FILE__, __LINE__); \
 	}						\
-	res = res;					\
 }
 
 #define is(a, b, fmt, args...)	{			\
@@ -117,7 +116,6 @@ int check_plan(void);
 		_space(stderr);			\
 		fprintf(stderr, "#   in %s at line %d\n", __FILE__, __LINE__); \
 	}						\
-	res = res;					\
 }
 
 #define isnt(a, b, fmt, args...) {			\
@@ -130,7 +128,6 @@ int check_plan(void);
 		_space(stderr);			\
 		fprintf(stderr, "#   in %s at line %d\n", __FILE__, __LINE__); \
 	}						\
-	res = res;					\
 }
 
 #if defined(__cplusplus)