From 0797bd59532e4e0fcf51628fac050d196e06a15d Mon Sep 17 00:00:00 2001 From: Uday Date: Wed, 27 Dec 2017 15:05:28 +0530 Subject: [PATCH 1/3] --max-version for ck can now be at 0.6.0 anything above this should attract a bit of digging --- configure.ac | 2 +- travis/deps.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index c33170a..fd684b8 100644 --- a/configure.ac +++ b/configure.ac @@ -140,7 +140,7 @@ esac # If you're bumping the CK max-version here, you must also bump it in # travis/deps.sh otherwise you will break the CI build -if ! $PKG_CONFIG --exists --atleast-version=0.5.0 --max-version=0.5.1 --print-errors ck ; then +if ! $PKG_CONFIG --exists --atleast-version=0.5.0 --max-version=0.6.0 --print-errors ck ; then AC_MSG_ERROR([ck is required]) fi CFLAGS="$CFLAGS `$PKG_CONFIG --cflags ck`" diff --git a/travis/deps.sh b/travis/deps.sh index 810c8eb..ba4715c 100755 --- a/travis/deps.sh +++ b/travis/deps.sh @@ -10,7 +10,7 @@ esac HERE=$PWD # There is no CK package available for ubuntu yet -CK_VER=0.5.1 +CK_VER=0.6.0 CK_RELEASE=https://github.com/concurrencykit/ck/archive/$CK_VER.tar.gz if test ! -f $CK_VER.tar.gz ; then wget $CK_RELEASE From f3813d1600ef16bde49f43da0ddb25e0e88c62d4 Mon Sep 17 00:00:00 2001 From: Uday Date: Wed, 27 Dec 2017 15:52:54 +0530 Subject: [PATCH 2/3] Issues with Travis build env. --- .travis.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.travis.yml b/.travis.yml index b325abd..813cba5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,3 +1,5 @@ +group: deprecated-2017Q4 + language: - c @@ -7,3 +9,4 @@ compiler: before_script: ./travis/deps.sh script: ./travis/run.sh + From 99f36f993ff05797161e29315157f8e7285f047b Mon Sep 17 00:00:00 2001 From: Uday Date: Wed, 27 Dec 2017 17:14:31 +0530 Subject: [PATCH 3/3] Getting things to build with clang 3.9 --- .travis.yml | 2 -- corelib/hook.c | 2 +- include/phenom/hook.h | 2 +- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 813cba5..072d351 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,3 @@ -group: deprecated-2017Q4 - language: - c diff --git a/corelib/hook.c b/corelib/hook.c index 1d06a83..8d7d257 100644 --- a/corelib/hook.c +++ b/corelib/hook.c @@ -352,7 +352,7 @@ ph_result_t ph_hook_unregister_cstr(const char *name, ph_hook_func func, return do_unregister(hp, func, closure); } -void ph_hook_invoke_vargs(ph_hook_point_t *hook, uint8_t nargs, ...) +void ph_hook_invoke_vargs(ph_hook_point_t *hook, uint32_t nargs, ...) { va_list ap; diff --git a/include/phenom/hook.h b/include/phenom/hook.h index 9e3c765..dcf38e1 100644 --- a/include/phenom/hook.h +++ b/include/phenom/hook.h @@ -118,7 +118,7 @@ static inline void ph_hook_invokev(ph_hook_point_t *hook, * * Each argument MUST be a pointer to the value in question */ -void ph_hook_invoke_vargs(ph_hook_point_t *hook, uint8_t nargs, ...); +void ph_hook_invoke_vargs(ph_hook_point_t *hook, uint32_t nargs, ...); #define ph_hook_invoke(hook, nargs, ...) do { \ ph_debug_assert(nargs < PH_HOOK_MAX_VARGS, "nargs too big"); \