diff options
| author | Sander Vrijders <sander.vrijders@intec.ugent.be> | 2016-02-23 16:14:38 +0100 |
|---|---|---|
| committer | Sander Vrijders <sander.vrijders@intec.ugent.be> | 2016-02-23 16:14:38 +0100 |
| commit | d773fdaad545c122ff81acb57080c8baf46f3735 (patch) | |
| tree | 0205ce45761ebfd0b49a8b007f0ecb80a5ceb533 | |
| parent | 30efb0c8366cfb34a275feb21ae67a61c37b8183 (diff) | |
| parent | 61670a5b3d37ee8bb611c5d08cc216f4b6d9570b (diff) | |
| download | ouroboros-d773fdaad545c122ff81acb57080c8baf46f3735.tar.gz ouroboros-d773fdaad545c122ff81acb57080c8baf46f3735.zip | |
Merged in sandervrijders/ouroboros/be (pull request #4)
build: Require usage of C89
| -rw-r--r-- | CMakeLists.txt | 17 | ||||
| -rw-r--r-- | cmake/CompilerUtils.cmake | 10 | ||||
| -rw-r--r-- | include/ouroboros/common.h | 1 | ||||
| -rw-r--r-- | src/lib/bitmap.c | 2 |
4 files changed, 16 insertions, 14 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index efbc3706..84a42eb9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 3.0.0) set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake") #set(CMAKE_VERBOSE_MAKEFILE ON) -project(ouroboros) +project(ouroboros C) include(GitVersionGen) GIT_VERSION_GEN() @@ -30,10 +30,11 @@ message(STATUS "Package install prefix: ${CMAKE_INSTALL_PREFIX}") include(FindPkgConfig) include(CompilerUtils) -test_and_set_cxx_compiler_flag_global(-Wall) -test_and_set_cxx_compiler_flag_global(-Werror) -test_and_set_cxx_compiler_flag_global(-Wundef) -test_and_set_cxx_compiler_flag_global(-fmax-errors=1) +test_and_set_c_compiler_flag_global(-std=c89) +test_and_set_c_compiler_flag_global(-Wall) +test_and_set_c_compiler_flag_global(-Werror) +test_and_set_c_compiler_flag_global(-Wundef) +test_and_set_c_compiler_flag_global(-fmax-errors=1) configure_file( "${CMAKE_CURRENT_SOURCE_DIR}/ouroboros.pc.in" @@ -46,7 +47,7 @@ add_subdirectory(include) add_subdirectory(src) add_subdirectory(tests) -# We may have to move this to the subdirs +# FIXME: We may have to move this to the subdirs include(MacroAddCompileFlags) if (CMAKE_BUILD_TYPE MATCHES Debug) MACRO_ADD_COMPILE_FLAGS(ipcpd -DCONFIG_OUROBOROS_DEBUG) @@ -55,8 +56,8 @@ if (CMAKE_BUILD_TYPE MATCHES Debug) MACRO_ADD_COMPILE_FLAGS(irm -DCONFIG_OUROBOROS_DEBUG) endif (CMAKE_BUILD_TYPE MATCHES Debug) -include(FeatureSummary) -print_enabled_features() +#include(FeatureSummary) +#print_enabled_features() # Uninstall target configure_file( diff --git a/cmake/CompilerUtils.cmake b/cmake/CompilerUtils.cmake index 99d9b662..5cea44b6 100644 --- a/cmake/CompilerUtils.cmake +++ b/cmake/CompilerUtils.cmake @@ -1,15 +1,15 @@ -include(CheckCXXCompilerFlag) +include(CheckCCompilerFlag) -function(test_and_set_cxx_compiler_flag_global _flag) +function(test_and_set_c_compiler_flag_global _flag) string(REGEX REPLACE "-" "_" _sflag ${_flag}) - check_cxx_compiler_flag(${_flag} COMPILER_SUPPORTS_FLAG_${_sflag}) + check_c_compiler_flag(${_flag} COMPILER_SUPPORTS_FLAG_${_sflag}) if(COMPILER_SUPPORTS_FLAG_${_sflag}) message(STATUS "Compiler supports flag ${_flag}, added globally") - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${_flag}" PARENT_SCOPE) + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${_flag}" PARENT_SCOPE) else(${_retval}) message(STATUS "Compiler does not support flag ${_flag}, discarded") endif() -endfunction(test_and_set_cxx_compiler_flag_global) +endfunction(test_and_set_c_compiler_flag_global) diff --git a/include/ouroboros/common.h b/include/ouroboros/common.h index 90431208..09900a1f 100644 --- a/include/ouroboros/common.h +++ b/include/ouroboros/common.h @@ -26,6 +26,7 @@ #include <stdint.h> #include <unistd.h> #include <stdbool.h> +#include <errno.h> typedef uint32_t port_id_t; diff --git a/src/lib/bitmap.c b/src/lib/bitmap.c index cb414e7f..3aaa422c 100644 --- a/src/lib/bitmap.c +++ b/src/lib/bitmap.c @@ -187,7 +187,7 @@ int rbmp_release(struct rbmp * b, rid = id - b->offset; - bitmap_clear(b->bitmap, id); + bitmap_clear(b->bitmap, rid); return 0; } |