diff --git a/Makefile b/Makefile index a242de3..eb0ae2d 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -# +SHELL := /bin/bash include ../../Makefile.defs auto_gen= @@ -21,9 +21,6 @@ DEFS+=$(MYINC_PARAMS) LIBS+= -L$(SYSBASE)/include/lib -L/usr/local/lib/ -L$(LOCALBASE)/lib -L./libzzz/lib LIBS+= -lzzz -SERLIBPATH=../../lib -SER_LIBS+=$(SERLIBPATH)/srutils/srutils - include ../../Makefile.modules libzzz.a: diff --git a/libzzz/CMakeLists.txt b/libzzz/CMakeLists.txt index c4fc32c..b643f33 100644 --- a/libzzz/CMakeLists.txt +++ b/libzzz/CMakeLists.txt @@ -1,7 +1,7 @@ # # Project Properties # -CMAKE_MINIMUM_REQUIRED (VERSION 2.6.2) +CMAKE_MINIMUM_REQUIRED (VERSION 2.8.12) PROJECT (zzz) SET (APPLICATION_NAME "ZZZ Library") SET (APPLICATION_CODENAME "${PROJECT_NAME}") @@ -41,7 +41,7 @@ INCLUDE_DIRECTORIES ("${MAINFOLDER}/src") # # Locate Project Prerequisites SET(BOOST_ROOT "/usr/include") -FIND_PACKAGE (Boost 1.53 COMPONENTS "system" REQUIRED) +FIND_PACKAGE (Boost 1.74 COMPONENTS "system" REQUIRED) INCLUDE_DIRECTORIES (${Boost_INCLUDE_DIRS}) LINK_DIRECTORIES (${Boost_LIBRARY_DIRS}) diff --git a/libzzz/src/test/catch.hpp b/libzzz/src/test/catch.hpp index be41486..bfe57d3 100644 --- a/libzzz/src/test/catch.hpp +++ b/libzzz/src/test/catch.hpp @@ -64,7 +64,7 @@ // #included from: catch_compiler_capabilities.h #define TWOBLUECUBES_CATCH_COMPILER_CAPABILITIES_HPP_INCLUDED -// Much of the following code is based on Boost (1.53) +// Much of the following code is based on Boost (1.74) #ifdef __clang__ diff --git a/zzz_mod.c b/zzz_mod.c index 7bc2e89..1a35b44 100644 --- a/zzz_mod.c +++ b/zzz_mod.c @@ -48,7 +48,7 @@ static int get_incremented_number_mod_f (struct sip_msg *msg, static cmd_export_t cmds[] = { {"get_incremented_number_mod", (cmd_function)get_incremented_number_mod_f, 1, fixup_get_params, fixup_get_params_free, ANY_ROUTE}, - {0, 0, 0, 0, 0} + {0, 0, 0, 0, 0, 0} }; /* Exported parameters */ @@ -60,18 +60,16 @@ static param_export_t params[] = { /* Module interface */ struct module_exports exports = { - "zzz", + "zzz", /* module name */ DEFAULT_DLFLAGS, /* dlopen flags */ - cmds, /* Exported functions */ - params, /* Exported parameters */ - 0, /* exported statistics */ - 0, /* exported MI functions */ - 0, /* exported pseudo-variables */ - 0, /* extra processes */ - mod_init, /* module initialization function */ - 0, /* response function*/ - destroy, /* destroy function */ - 0 /* per-child init function */ + cmds, /* cmd (cfg function) exports */ + params, /* param exports */ + 0, /* RPC method exports */ + 0, /* pseudo-variables exports */ + 0, /* response handling function */ + mod_init, /* module init function */ + 0, /* per-child init function */ + destroy /* destroy function */ }; /* Module initialization function - The main initialization function will be called