From 7368ef56c6ffc36339ff99bbc982d547ca5b3715 Mon Sep 17 00:00:00 2001 From: Sergei Golubchik Date: Tue, 31 Jul 2012 11:31:26 +0200 Subject: MDEV-418 Feedback plugin statisics problem Add the check for sys/utsname.h to configure.cmake --- configure.cmake | 1 + 1 file changed, 1 insertion(+) (limited to 'configure.cmake') diff --git a/configure.cmake b/configure.cmake index f9eb784fe80..3d1e2f25f65 100644 --- a/configure.cmake +++ b/configure.cmake @@ -261,6 +261,7 @@ CHECK_INCLUDE_FILES (vis.h HAVE_VIS_H) CHECK_INCLUDE_FILES (wchar.h HAVE_WCHAR_H) CHECK_INCLUDE_FILES (wctype.h HAVE_WCTYPE_H) CHECK_INCLUDE_FILES (sys/sockio.h HAVE_SYS_SOCKIO_H) +CHECK_INCLUDE_FILES (sys/utsname.h HAVE_SYS_UTSNAME_H) IF(BFD_H_EXISTS) IF(NOT_FOR_DISTRIBUTION) -- cgit v1.2.1 From 0117a92fedc2e5294682127d54034af5b3f96c8e Mon Sep 17 00:00:00 2001 From: Sergei Golubchik Date: Tue, 31 Jul 2012 19:29:07 +0200 Subject: MDEV-419 ensure that all HAVE_XXX constants can be set by cmake add missing checks to configure.cmake remove dead code and unused HAVE_xxx constants from the sources --- configure.cmake | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'configure.cmake') diff --git a/configure.cmake b/configure.cmake index 3d1e2f25f65..1fb5fc920f6 100644 --- a/configure.cmake +++ b/configure.cmake @@ -202,6 +202,7 @@ CHECK_INCLUDE_FILES (grp.h HAVE_GRP_H) CHECK_INCLUDE_FILES (ieeefp.h HAVE_IEEEFP_H) CHECK_INCLUDE_FILES (inttypes.h HAVE_INTTYPES_H) CHECK_INCLUDE_FILES (langinfo.h HAVE_LANGINFO_H) +CHECK_INCLUDE_FILES (linux/unistd.h HAVE_LINUX_UNISTD_H) CHECK_INCLUDE_FILES (limits.h HAVE_LIMITS_H) CHECK_INCLUDE_FILES (locale.h HAVE_LOCALE_H) CHECK_INCLUDE_FILES (malloc.h HAVE_MALLOC_H) @@ -327,6 +328,7 @@ ENDIF() # # Tests for functions # +CHECK_FUNCTION_EXISTS (access HAVE_ACCESS) #CHECK_FUNCTION_EXISTS (aiowait HAVE_AIOWAIT) CHECK_FUNCTION_EXISTS (aio_read HAVE_AIO_READ) CHECK_FUNCTION_EXISTS (alarm HAVE_ALARM) @@ -555,6 +557,10 @@ IF(NOT SIZEOF_MODE_T) SET(mode_t int) ENDIF() +IF(HAVE_NETINET_IN_H) + SET(CMAKE_EXTRA_INCLUDE_FILES netinet/in.h) + MY_CHECK_TYPE_SIZE(in_addr_t IN_ADDR_T) +ENDIF(HAVE_NETINET_IN_H) IF(HAVE_STDINT_H) SET(CMAKE_EXTRA_INCLUDE_FILES stdint.h) -- cgit v1.2.1 From dd8bd2e4c38a3e052b48ba8704e8a7aa89affd74 Mon Sep 17 00:00:00 2001 From: Michael Widenius Date: Wed, 15 Aug 2012 09:34:18 +0300 Subject: Fixed compiler warnings sql/item_subselect.cc: Added purecov info sql/sql_select.cc: Added cast storage/innobase/handler/ha_innodb.cc: Added cast storage/xtradb/btr/btr0btr.c: Added buf_block_get_frame_fast() to avoid compiler warning storage/xtradb/handler/ha_innodb.cc: Added cast storage/xtradb/include/buf0buf.h: Innodb has buf_block_get_frame(block) defined as (block)->frame. Didn't want to do a big change to break xtradb as it may use block_get_frame() differently, so I mad this quick hack to patch one compiler warning. --- configure.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'configure.cmake') diff --git a/configure.cmake b/configure.cmake index 1fb5fc920f6..05fa80e852f 100644 --- a/configure.cmake +++ b/configure.cmake @@ -56,10 +56,10 @@ ENDIF() # Always enable -Wall for gnu C/C++ IF(CMAKE_COMPILER_IS_GNUCXX) - SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wno-unused-parameter") + SET(CMAKE_CXX_FLAGS "-Wall ${CMAKE_CXX_FLAGS} -Wno-unused-parameter") ENDIF() IF(CMAKE_COMPILER_IS_GNUCC) - SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall") + SET(CMAKE_C_FLAGS "-Wall ${CMAKE_C_FLAGS}") ENDIF() -- cgit v1.2.1