Skip to content
This repository was archived by the owner on Mar 9, 2019. It is now read-only.

--max-version for ck can now be at 0.6.0 #86

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,4 @@ compiler:

before_script: ./travis/deps.sh
script: ./travis/run.sh

2 changes: 1 addition & 1 deletion configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -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`"
Expand Down
2 changes: 1 addition & 1 deletion corelib/hook.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
2 changes: 1 addition & 1 deletion include/phenom/hook.h
Original file line number Diff line number Diff line change
Expand Up @@ -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"); \
Expand Down
2 changes: 1 addition & 1 deletion travis/deps.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down