Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

update to kamailio-5.8 #1

Open
wants to merge 6 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
5 changes: 1 addition & 4 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#
SHELL := /bin/bash

include ../../Makefile.defs
auto_gen=
Expand All @@ -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:
Expand Down
4 changes: 2 additions & 2 deletions libzzz/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -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}")
Expand Down Expand Up @@ -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})

Expand Down
2 changes: 1 addition & 1 deletion libzzz/src/test/catch.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -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__

Expand Down
22 changes: 10 additions & 12 deletions zzz_mod.c
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand All @@ -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
Expand Down