[sr-dev] git:master: modules/*: updated include paths

Module: sip-router Branch: master Commit: 63a09d8562a1ac3679dc34c409a37f1d6617e430 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=63a09d8… Author: Daniel-Constantin Mierla &lt;miconda(a)gmail.com&gt; Committer: Daniel-Constantin Mierla &lt;miconda(a)gmail.com&gt; Date: Sun Jan 20 13:26:01 2013 +0100 modules/*: updated include paths --- modules/acc_radius/acc_radius_mod.c | 2 +- modules/app_lua/app_lua_exp.c | 34 +++++++++++++++++----------------- modules/dialog_ng/dialog.c | 2 +- modules/dialog_ng/dlg_handlers.c | 2 +- modules/mediaproxy/mediaproxy.c | 4 ++-- modules/osp/orig_transaction.c | 2 +- modules/osp/osp_mod.c | 2 +- modules/pua_reginfo/notify.c | 2 +- modules/registrar/lookup.h | 2 +- modules/registrar/reg_mod.c | 2 +- modules/registrar/regpv.h | 2 +- modules/registrar/save.h | 2 +- modules/utils/xcap_auth.c | 8 ++++---- modules/xcap_server/xcap_misc.c | 2 +- modules/xcap_server/xcap_server.c | 2 +- 15 files changed, 35 insertions(+), 35 deletions(-) diff --git a/modules/acc_radius/acc_radius_mod.c b/modules/acc_radius/acc_radius_mod.c index abfb69f..07f39ff 100644 --- a/modules/acc_radius/acc_radius_mod.c +++ b/modules/acc_radius/acc_radius_mod.c @@ -47,7 +47,7 @@ #include "../../mem/mem.h" #include "../../parser/parse_to.h" #include "../../lib/kcore/radius.h" -#include "../../modules_k/acc/acc_api.h" +#include "../../modules/acc/acc_api.h" #include "acc_radius_mod.h" MODULE_VERSION diff --git a/modules/app_lua/app_lua_exp.c b/modules/app_lua/app_lua_exp.c index fad9864..cb25c9a 100644 --- a/modules/app_lua/app_lua_exp.c +++ b/modules/app_lua/app_lua_exp.c @@ -33,27 +33,27 @@ #include "../../modules/sl/sl.h" #include "../../modules/tm/tm_load.h" -#include "../../modules_k/sqlops/sql_api.h" -#include "../../modules_k/rr/api.h" +#include "../../modules/sqlops/sql_api.h" +#include "../../modules/rr/api.h" #include "../../modules/auth/api.h" -#include "../../modules_k/auth_db/api.h" -#include "../../modules_k/maxfwd/api.h" -#include "../../modules_k/registrar/api.h" -#include "../../modules_k/dispatcher/api.h" +#include "../../modules/auth_db/api.h" +#include "../../modules/maxfwd/api.h" +#include "../../modules/registrar/api.h" +#include "../../modules/dispatcher/api.h" #include "../../modules/xhttp/api.h" #include "../../modules/sdpops/api.h" -#include "../../modules_k/presence/bind_presence.h" -#include "../../modules_k/presence_xml/api.h" -#include "../../modules_k/textops/api.h" -#include "../../modules_k/pua_usrloc/api.h" -#include "../../modules_k/siputils/siputils.h" -#include "../../modules_k/rls/api.h" -#include "../../modules_k/alias_db/api.h" -#include "../../modules_k/msilo/api.h" -#include "../../modules_k/uac/api.h" +#include "../../modules/presence/bind_presence.h" +#include "../../modules/presence_xml/api.h" +#include "../../modules/textops/api.h" +#include "../../modules/pua_usrloc/api.h" +#include "../../modules/siputils/siputils.h" +#include "../../modules/rls/api.h" +#include "../../modules/alias_db/api.h" +#include "../../modules/msilo/api.h" +#include "../../modules/uac/api.h" #include "../../modules/sanity/api.h" -#include "../../modules_k/cfgutils/api.h" -#include "../../modules_k/tmx/api.h" +#include "../../modules/cfgutils/api.h" +#include "../../modules/tmx/api.h" #include "../../modules/mqueue/api.h" #include "app_lua_api.h" diff --git a/modules/dialog_ng/dialog.c b/modules/dialog_ng/dialog.c index 4c0bc6b..748515d 100644 --- a/modules/dialog_ng/dialog.c +++ b/modules/dialog_ng/dialog.c @@ -21,7 +21,7 @@ #include "../../parser/parse_to.h" #include "../../modules/tm/tm_load.h" #include "../../rpc_lookup.h" -#include "../../modules_k/rr/api.h" +#include "../../modules/rr/api.h" #include "dlg_hash.h" #include "dlg_timer.h" diff --git a/modules/dialog_ng/dlg_handlers.c b/modules/dialog_ng/dlg_handlers.c index f05c7eb..7536725 100644 --- a/modules/dialog_ng/dlg_handlers.c +++ b/modules/dialog_ng/dlg_handlers.c @@ -21,7 +21,7 @@ #include "../../parser/parse_from.h" #include "../../parser/parse_rr.h" #include "../../modules/tm/tm_load.h" -#include "../../modules_k/rr/api.h" +#include "../../modules/rr/api.h" #include "dlg_hash.h" #include "dlg_timer.h" #include "dlg_cb.h" diff --git a/modules/mediaproxy/mediaproxy.c b/modules/mediaproxy/mediaproxy.c index 4cb16c9..9b994bf 100644 --- a/modules/mediaproxy/mediaproxy.c +++ b/modules/mediaproxy/mediaproxy.c @@ -46,8 +46,8 @@ #include "../../parser/parse_to.h" #include "../../parser/parse_param.h" #include "../../msg_translator.h" -#include "../../modules_k/dialog/dlg_load.h" -#include "../../modules_k/dialog/dlg_hash.h" +#include "../../modules/dialog/dlg_load.h" +#include "../../modules/dialog/dlg_hash.h" MODULE_VERSION diff --git a/modules/osp/orig_transaction.c b/modules/osp/orig_transaction.c index 34fd482..6bc3937 100644 --- a/modules/osp/orig_transaction.c +++ b/modules/osp/orig_transaction.c @@ -33,7 +33,7 @@ #include "../../dset.h" #include "../../usr_avp.h" #include "../../mem/mem.h" -#include "../../modules_k/siputils/siputils.h" +#include "../../modules/siputils/siputils.h" #include "orig_transaction.h" #include "destination.h" #include "osptoolkit.h" diff --git a/modules/osp/osp_mod.c b/modules/osp/osp_mod.c index 33af6d7..e5b14cd 100644 --- a/modules/osp/osp_mod.c +++ b/modules/osp/osp_mod.c @@ -34,7 +34,7 @@ #include <osp/osp.h> #include "../rr/api.h" -#include "../../modules_k/siputils/siputils.h" +#include "../../modules/siputils/siputils.h" #include "osp_mod.h" #include "orig_transaction.h" #include "term_transaction.h" diff --git a/modules/pua_reginfo/notify.c b/modules/pua_reginfo/notify.c index 3b20e4e..499cccb 100644 --- a/modules/pua_reginfo/notify.c +++ b/modules/pua_reginfo/notify.c @@ -25,7 +25,7 @@ #include "../../parser/parse_from.h" #include "../../parser/parse_content.h" #include "../../parser/parse_uri.h" -#include "../../modules_k/usrloc/usrloc.h" +#include "../../modules/usrloc/usrloc.h" #include <libxml/parser.h> #include "pua_reginfo.h" diff --git a/modules/registrar/lookup.h b/modules/registrar/lookup.h index 93780ae..9c10240 100644 --- a/modules/registrar/lookup.h +++ b/modules/registrar/lookup.h @@ -33,7 +33,7 @@ #define LOOKUP_H #include "../../parser/msg_parser.h" -#include "../../modules_k/usrloc/usrloc.h" +#include "../../modules/usrloc/usrloc.h" /*! \brief diff --git a/modules/registrar/reg_mod.c b/modules/registrar/reg_mod.c index a493e79..a5c427d 100644 --- a/modules/registrar/reg_mod.c +++ b/modules/registrar/reg_mod.c @@ -66,7 +66,7 @@ #include "../../error.h" #include "../../socket_info.h" #include "../../pvar.h" -#include "../../modules_k/usrloc/usrloc.h" +#include "../../modules/usrloc/usrloc.h" #include "../../lib/kcore/statistics.h" #include "../../lib/srutils/sruid.h" #include "../../modules/sl/sl.h" diff --git a/modules/registrar/regpv.h b/modules/registrar/regpv.h index 3af7154..5b291cb 100644 --- a/modules/registrar/regpv.h +++ b/modules/registrar/regpv.h @@ -33,7 +33,7 @@ #define _REGPV_H_ #include "../../pvar.h" -#include "../../modules_k/usrloc/usrloc.h" +#include "../../modules/usrloc/usrloc.h" int pv_get_ulc(struct sip_msg *msg, pv_param_t *param, pv_value_t *res); diff --git a/modules/registrar/save.h b/modules/registrar/save.h index fbb668e..69e1352 100644 --- a/modules/registrar/save.h +++ b/modules/registrar/save.h @@ -40,7 +40,7 @@ #include "../../parser/msg_parser.h" -#include "../../modules_k/usrloc/usrloc.h" +#include "../../modules/usrloc/usrloc.h" /*! \brief diff --git a/modules/utils/xcap_auth.c b/modules/utils/xcap_auth.c index eb87e7e..ec67c5b 100644 --- a/modules/utils/xcap_auth.c +++ b/modules/utils/xcap_auth.c @@ -44,10 +44,10 @@ #include "../../dprint.h" #include "../../pvar.h" #include "../../parser/parse_uri.h" -#include "../../modules_k/presence/subscribe.h" -#include "../../modules_k/presence/utils_func.h" -#include "../../modules_k/presence/hash.h" -#include "../../modules_k/xcap_client/xcap_callbacks.h" +#include "../../modules/presence/subscribe.h" +#include "../../modules/presence/utils_func.h" +#include "../../modules/presence/hash.h" +#include "../../modules/xcap_client/xcap_callbacks.h" #include "utils.h" #include "pidf.h" diff --git a/modules/xcap_server/xcap_misc.c b/modules/xcap_server/xcap_misc.c index 540e190..d947e7c 100644 --- a/modules/xcap_server/xcap_misc.c +++ b/modules/xcap_server/xcap_misc.c @@ -32,7 +32,7 @@ #include "../../dprint.h" #include "../../mem/mem.h" #include "../../parser/parse_param.h" -#include "../../modules_k/xcap_client/xcap_callbacks.h" +#include "../../modules/xcap_client/xcap_callbacks.h" #include "xcap_misc.h" diff --git a/modules/xcap_server/xcap_server.c b/modules/xcap_server/xcap_server.c index 2287f26..24e3269 100644 --- a/modules/xcap_server/xcap_server.c +++ b/modules/xcap_server/xcap_server.c @@ -42,7 +42,7 @@ #include "../../data_lump_rpl.h" #include "../../mod_fix.h" #include "../../parser/parse_uri.h" -#include "../../modules_k/xcap_client/xcap_callbacks.h" +#include "../../modules/xcap_client/xcap_callbacks.h" #include "../../modules/sl/sl.h" #include "../../lib/kcore/cmpapi.h" #include "../../ip_addr.h"