diff options
author | Riza Sulistyo <riza@teluu.com> | 2013-04-23 07:53:25 +0000 |
---|---|---|
committer | Riza Sulistyo <riza@teluu.com> | 2013-04-23 07:53:25 +0000 |
commit | 1698328b74967bff2b86c705747b40b526275377 (patch) | |
tree | 5c362e276123f96767cbd03ba4b86cf0a5c3c6a5 | |
parent | e12b016e143ffbc81d3224d282bcaec31b755c04 (diff) |
Re #1643: Modification to avoid namespace conflict with pjsua
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@4489 74dad513-b988-da41-8d7b-12977e46ad98
-rw-r--r-- | pjsip-apps/build/Makefile | 4 | ||||
-rw-r--r-- | pjsip-apps/build/pjsua.vcproj | 10 | ||||
-rw-r--r-- | pjsip-apps/src/pjsua/main.c | 15 | ||||
-rw-r--r-- | pjsip-apps/src/pjsua/pjsua_app.c | 38 | ||||
-rw-r--r-- | pjsip-apps/src/pjsua/pjsua_app.h | 14 | ||||
-rw-r--r-- | pjsip-apps/src/pjsua/pjsua_app_cli.c (renamed from pjsip-apps/src/pjsua/pjsua_cli.c) | 7 | ||||
-rw-r--r-- | pjsip-apps/src/pjsua/pjsua_app_common.c (renamed from pjsip-apps/src/pjsua/pjsua_common.c) | 29 | ||||
-rw-r--r-- | pjsip-apps/src/pjsua/pjsua_app_common.h (renamed from pjsip-apps/src/pjsua/pjsua_common.h) | 54 | ||||
-rw-r--r-- | pjsip-apps/src/pjsua/pjsua_app_config.c (renamed from pjsip-apps/src/pjsua/pjsua_config.c) | 8 | ||||
-rw-r--r-- | pjsip-apps/src/pjsua/pjsua_app_legacy.c (renamed from pjsip-apps/src/pjsua/pjsua_legacy.c) | 6 |
10 files changed, 86 insertions, 99 deletions
diff --git a/pjsip-apps/build/Makefile b/pjsip-apps/build/Makefile index cb48d718..6e5f2874 100644 --- a/pjsip-apps/build/Makefile +++ b/pjsip-apps/build/Makefile @@ -33,8 +33,8 @@ export _CXXFLAGS:= $(_CFLAGS) $(CC_CXXFLAGS) $(OS_CXXFLAGS) $(M_CXXFLAGS) \ # export PJSUA_SRCDIR = ../src/pjsua export PJSUA_OBJS += $(OS_OBJS) $(M_OBJS) $(CC_OBJS) $(HOST_OBJS) \ - main.o pjsua_app.o pjsua_cli.o pjsua_common.o \ - pjsua_config.o pjsua_legacy.o + main.o pjsua_app.o pjsua_app_cli.o pjsua_app_common.o \ + pjsua_app_config.o pjsua_app_legacy.o export PJSUA_CFLAGS += $(_CFLAGS) export PJSUA_LDFLAGS += $(APP_LDFLAGS) $(APP_LDLIBS) $(LDFLAGS) export PJSUA_EXE:=../bin/pjsua-$(TARGET_NAME)$(HOST_EXE) diff --git a/pjsip-apps/build/pjsua.vcproj b/pjsip-apps/build/pjsua.vcproj index d79126a4..f50543d5 100644 --- a/pjsip-apps/build/pjsua.vcproj +++ b/pjsip-apps/build/pjsua.vcproj @@ -3708,19 +3708,19 @@ </FileConfiguration>
</File>
<File
- RelativePath="..\src\pjsua\pjsua_cli.c"
+ RelativePath="..\src\pjsua\pjsua_app_cli.c"
>
</File>
<File
- RelativePath="..\src\pjsua\pjsua_common.c"
+ RelativePath="..\src\pjsua\pjsua_app_common.c"
>
</File>
<File
- RelativePath="..\src\pjsua\pjsua_config.c"
+ RelativePath="..\src\pjsua\pjsua_app_config.c"
>
</File>
<File
- RelativePath="..\src\pjsua\pjsua_legacy.c"
+ RelativePath="..\src\pjsua\pjsua_app_legacy.c"
>
</File>
</Filter>
@@ -3733,7 +3733,7 @@ >
</File>
<File
- RelativePath="..\src\pjsua\pjsua_common.h"
+ RelativePath="..\src\pjsua\pjsua_app_common.h"
>
</File>
</Filter>
diff --git a/pjsip-apps/src/pjsua/main.c b/pjsip-apps/src/pjsua/main.c index 4df0a56e..048eea8f 100644 --- a/pjsip-apps/src/pjsua/main.c +++ b/pjsip-apps/src/pjsua/main.c @@ -24,7 +24,7 @@ static pj_bool_t running = PJ_TRUE; static pj_status_t receive_end_sig; static pj_thread_t *sig_thread; -static app_cfg_t cfg; +static pjsua_app_cfg_t cfg; /* Called when CLI (re)started */ void on_app_started(pj_status_t status, const char *msg) @@ -32,13 +32,12 @@ void on_app_started(pj_status_t status, const char *msg) pj_perror(3, THIS_FILE, status, (msg)?msg:""); } -pj_bool_t on_app_stopped(pj_bool_t restart, int argc, char** argv) +void on_app_stopped(pj_bool_t restart, int argc, char** argv) { cfg.argc = argc; cfg.argv = argv; running = restart; - return PJ_TRUE; } #if defined(PJ_WIN32) && PJ_WIN32!=0 @@ -60,7 +59,7 @@ static BOOL WINAPI CtrlHandler(DWORD fdwCtrlType) pj_thread_register("ctrlhandler", handler_desc, &sig_thread); PJ_LOG(3,(THIS_FILE, "Ctrl-C detected, quitting..")); receive_end_sig = PJ_TRUE; - app_destroy(); + pjsua_app_destroy(); ExitProcess(1); PJ_UNREACHED(return TRUE;) @@ -104,19 +103,19 @@ int main(int argc, char *argv[]) setup_socket_signal(); while (running) { - status = app_init(&cfg); + status = pjsua_app_init(&cfg); if (status == PJ_SUCCESS) { - status = app_run(PJ_TRUE); + status = pjsua_app_run(PJ_TRUE); } else { pj_perror(3, THIS_FILE, status, "Failed init"); running = PJ_FALSE; } if (!receive_end_sig) { - app_destroy(); + pjsua_app_destroy(); /* This is on purpose */ - app_destroy(); + pjsua_app_destroy(); } else { pj_thread_join(sig_thread); } diff --git a/pjsip-apps/src/pjsua/pjsua_app.c b/pjsip-apps/src/pjsua/pjsua_app.c index bd9f7980..bd67255e 100644 --- a/pjsip-apps/src/pjsua/pjsua_app.c +++ b/pjsip-apps/src/pjsua/pjsua_app.c @@ -46,15 +46,13 @@ static void stereo_demo(); #endif -pj_status_t app_destroy(void); - static void ringback_start(pjsua_call_id call_id); static void ring_start(pjsua_call_id call_id); static void ring_stop(pjsua_call_id call_id); -static pj_status_t pjsua_app_init(); -static pj_status_t pjsua_app_destroy(); +static pj_status_t app_init(); +static pj_status_t app_destroy(); -static app_cfg_t app_cfg; +static pjsua_app_cfg_t app_cfg; pj_str_t uri_arg; pj_bool_t app_running = PJ_FALSE; @@ -1216,7 +1214,7 @@ static pjsip_module mod_default_handler = /** CLI callback **/ /* Called on CLI (re)started, e.g: initial start, after iOS bg */ -PJ_DEF(void) cli_on_started(pj_status_t status) +void cli_on_started(pj_status_t status) { /* Notify app */ if (app_cfg.on_started) { @@ -1235,28 +1233,22 @@ PJ_DEF(void) cli_on_started(pj_status_t status) } /* Called on CLI quit */ -PJ_DEF(pj_bool_t) cli_on_stopped(pj_bool_t restart, int argc, char* argv[]) +void cli_on_stopped(pj_bool_t restart, int argc, char* argv[]) { /* Notify app */ if (app_cfg.on_stopped) - return (*app_cfg.on_stopped)(restart, argc, argv); - - return PJ_SUCCESS; + (*app_cfg.on_stopped)(restart, argc, argv); } /* Called on pjsua legacy quit */ -PJ_DEF(pj_bool_t) legacy_on_stopped(pj_bool_t restart) +void legacy_on_stopped(pj_bool_t restart) { /* Notify app */ if (app_cfg.on_stopped) - return (*app_cfg.on_stopped)(restart, 0, NULL); - - return PJ_SUCCESS; + (*app_cfg.on_stopped)(restart, 1, NULL); } - - /***************************************************************************** * Public API */ @@ -1282,7 +1274,7 @@ int stdout_refresh_proc(void *arg) return 0; } -static pj_status_t pjsua_app_init() +static pj_status_t app_init() { pjsua_transport_id transport_id = -1; pjsua_transport_config tcp_cfg; @@ -1844,12 +1836,12 @@ on_error: return status; } -PJ_DEF(pj_status_t) app_init(const app_cfg_t *cfg) +pj_status_t pjsua_app_init(const pjsua_app_cfg_t *cfg) { pj_status_t status; pj_memcpy(&app_cfg, cfg, sizeof(app_cfg)); - status = pjsua_app_init(); + status = app_init(); if (status != PJ_SUCCESS) return status; @@ -1860,7 +1852,7 @@ PJ_DEF(pj_status_t) app_init(const app_cfg_t *cfg) return status; } -pj_status_t app_run(pj_bool_t wait_telnet_cli) +pj_status_t pjsua_app_run(pj_bool_t wait_telnet_cli) { pj_thread_t *stdout_refresh_thread = NULL; pj_status_t status; @@ -1916,7 +1908,7 @@ on_return: return status; } -static pj_status_t pjsua_app_destroy() +static pj_status_t app_destroy() { pj_status_t status = PJ_SUCCESS; unsigned i; @@ -1981,11 +1973,11 @@ static pj_status_t pjsua_app_destroy() return status; } -pj_status_t app_destroy() +pj_status_t pjsua_app_destroy() { pj_status_t status; - status = pjsua_app_destroy(); + status = app_destroy(); if (app_config.use_cli) { cli_destroy(); diff --git a/pjsip-apps/src/pjsua/pjsua_app.h b/pjsip-apps/src/pjsua/pjsua_app.h index 46dcd937..a9c627bc 100644 --- a/pjsip-apps/src/pjsua/pjsua_app.h +++ b/pjsip-apps/src/pjsua/pjsua_app.h @@ -24,14 +24,14 @@ * Interface for user application to use pjsua with CLI/menu based UI. */ -#include "pjsua_common.h" +#include "pjsua_app_common.h" PJ_BEGIN_DECL /** * This structure contains the configuration of application. */ -typedef struct app_cfg_t +typedef struct pjsua_app_cfg_t { /** * The number of runtime arguments passed to the application. @@ -55,20 +55,20 @@ typedef struct app_cfg_t * GUI app needs to use a timer mechanism to wait before invoking the * cleanup procedure. */ - pj_bool_t (*on_stopped)(pj_bool_t restart, int argc, char** argv); + void (*on_stopped)(pj_bool_t restart, int argc, char** argv); /** * This will enable application to supply customize configuration other than * the basic configuration provided by pjsua. */ void (*on_config_init)(pjsua_app_config *cfg); -} app_cfg_t; +} pjsua_app_cfg_t; /** * This will initiate the pjsua and the user interface (CLI/menu UI) based on * the provided configuration. */ -PJ_DECL(pj_status_t) app_init(const app_cfg_t *app_cfg); +pj_status_t pjsua_app_init(const pjsua_app_cfg_t *app_cfg); /** * This will run the CLI/menu based UI. @@ -76,12 +76,12 @@ PJ_DECL(pj_status_t) app_init(const app_cfg_t *app_cfg); * or wait until user invoke the "shutdown"/"restart" command. GUI based app * should define this param as PJ_FALSE. */ -PJ_DECL(pj_status_t) app_run(pj_bool_t wait_telnet_cli); +pj_status_t pjsua_app_run(pj_bool_t wait_telnet_cli); /** * This will destroy/cleanup the application library. */ -PJ_DECL(pj_status_t) app_destroy(); +pj_status_t pjsua_app_destroy(); PJ_END_DECL diff --git a/pjsip-apps/src/pjsua/pjsua_cli.c b/pjsip-apps/src/pjsua/pjsua_app_cli.c index 1a384143..f46be780 100644 --- a/pjsip-apps/src/pjsua/pjsua_cli.c +++ b/pjsip-apps/src/pjsua/pjsua_app_cli.c @@ -18,9 +18,9 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "pjsua_common.h" +#include "pjsua_app_common.h" -#define THIS_FILE "pjsua_cli.c" +#define THIS_FILE "pjsua_app_cli.c" #define CHECK_PJSUA_RUNNING() if (pjsua_get_state()!=PJSUA_STATE_RUNNING) \ return PJ_EINVALIDOP @@ -160,7 +160,8 @@ PJ_DEF(void) cli_get_info(char *info, pj_size_t size) pj_cli_telnet_get_info(telnet_front_end, &telnet_info); pj_ansi_snprintf(info, size, "Telnet to %.*s:%d", - telnet_info.ip_address.slen, telnet_info.ip_address.ptr, + (int)telnet_info.ip_address.slen, + telnet_info.ip_address.ptr, telnet_info.port); } diff --git a/pjsip-apps/src/pjsua/pjsua_common.c b/pjsip-apps/src/pjsua/pjsua_app_common.c index 60c7dbe1..e02f0456 100644 --- a/pjsip-apps/src/pjsua/pjsua_common.c +++ b/pjsip-apps/src/pjsua/pjsua_app_common.c @@ -18,9 +18,9 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "pjsua_common.h" +#include "pjsua_app_common.h" -#define THIS_FILE "pjsua_common.c" +#define THIS_FILE "pjsua_app_common.c" #if defined(PJMEDIA_HAS_RTCP_XR) && (PJMEDIA_HAS_RTCP_XR != 0) # define SOME_BUF_SIZE (1024 * 10) @@ -38,7 +38,7 @@ pjsua_app_config app_config; pjsua_call_setting call_opt; pjsua_msg_data msg_data; -PJ_DEF(int) my_atoi(const char *cs) +int my_atoi(const char *cs) { pj_str_t s; @@ -58,7 +58,7 @@ PJ_DEF(int) my_atoi(const char *cs) * Find next call when current call is disconnected or when user * press ']' */ -PJ_DEF(pj_bool_t) find_next_call() +pj_bool_t find_next_call() { int i, max; @@ -81,7 +81,7 @@ PJ_DEF(pj_bool_t) find_next_call() return PJ_FALSE; } -PJ_DEF(pj_bool_t) find_prev_call() +pj_bool_t find_prev_call() { int i, max; @@ -107,7 +107,7 @@ PJ_DEF(pj_bool_t) find_prev_call() /* * Send arbitrary request to remote host */ -PJ_DEF(void) send_request(char *cstr_method, const pj_str_t *dst_uri) +void send_request(char *cstr_method, const pj_str_t *dst_uri) { pj_str_t str_method; pjsip_method method; @@ -134,7 +134,7 @@ PJ_DEF(void) send_request(char *cstr_method, const pj_str_t *dst_uri) * printing it is a bit tricky, it should be printed part by part as long * as the logger can accept. */ -PJ_DEF(void) log_call_dump(int call_id) +void log_call_dump(int call_id) { unsigned call_dump_len; unsigned part_len; @@ -167,7 +167,7 @@ PJ_DEF(void) log_call_dump(int call_id) } #ifdef PJSUA_HAS_VIDEO -PJ_DEF(void) app_config_init_video(pjsua_acc_config *acc_cfg) +void app_config_init_video(pjsua_acc_config *acc_cfg) { acc_cfg->vid_in_auto_show = app_config.vid.in_auto_show; acc_cfg->vid_out_auto_transmit = app_config.vid.out_auto_transmit; @@ -187,7 +187,7 @@ PJ_DEF(void) app_config_init_video(pjsua_acc_config *acc_cfg) } } #else -PJ_DEF(void) app_config_init_video(pjsua_acc_config *acc_cfg) +void app_config_init_video(pjsua_acc_config *acc_cfg) { PJ_UNUSED_ARG(acc_cfg); } @@ -198,7 +198,7 @@ PJ_DEF(void) app_config_init_video(pjsua_acc_config *acc_cfg) * Enable multipart in msg_data and add a dummy body into the * multipart bodies. */ - PJ_DEF(void) add_multipart(pjsua_msg_data *msg_data) + void add_multipart(pjsua_msg_data *msg_data) { static pjsip_multipart_part *alt_part; @@ -224,7 +224,7 @@ PJ_DEF(void) app_config_init_video(pjsua_acc_config *acc_cfg) * -1: arrange all windows * != -1: arrange only this window id */ -PJ_DEF(void) arrange_window(pjsua_vid_win_id wid) +void arrange_window(pjsua_vid_win_id wid) { #if PJSUA_HAS_VIDEO pjmedia_coord pos; @@ -258,8 +258,7 @@ PJ_DEF(void) arrange_window(pjsua_vid_win_id wid) #if PJSUA_HAS_VIDEO -PJ_DEF(void) vid_print_dev(int id, const pjmedia_vid_dev_info *vdi, - const char *title) +void vid_print_dev(int id, const pjmedia_vid_dev_info *vdi, const char *title) { char capnames[120]; char formats[120]; @@ -305,7 +304,7 @@ PJ_DEF(void) vid_print_dev(int id, const pjmedia_vid_dev_info *vdi, PJ_LOG(3,(THIS_FILE, " Supported formats: %s", formats)); } -PJ_DEF(void) vid_list_devs() +void vid_list_devs() { unsigned i, count; pjmedia_vid_dev_info vdi; @@ -337,7 +336,7 @@ PJ_DEF(void) vid_list_devs() } } -PJ_DEF(void) app_config_show_video(int acc_id, const pjsua_acc_config *acc_cfg) +void app_config_show_video(int acc_id, const pjsua_acc_config *acc_cfg) { PJ_LOG(3,(THIS_FILE, "Account %d:\n" diff --git a/pjsip-apps/src/pjsua/pjsua_common.h b/pjsip-apps/src/pjsua/pjsua_app_common.h index 9e51a8f4..3d2ebc4c 100644 --- a/pjsip-apps/src/pjsua/pjsua_common.h +++ b/pjsip-apps/src/pjsua/pjsua_app_common.h @@ -16,8 +16,8 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef __PJSUA_COMMON_H__ -#define __PJSUA_COMMON_H__ +#ifndef __PJSUA_APP_COMMON_H__ +#define __PJSUA_APP_COMMON_H__ #include <pjsua-lib/pjsua.h> @@ -167,49 +167,45 @@ extern pjsua_call_setting call_opt; extern pjsua_msg_data msg_data; extern pj_bool_t app_running; -PJ_DECL(int) my_atoi(const char *cs); -PJ_DECL(pj_bool_t) find_next_call(); -PJ_DECL(pj_bool_t) find_prev_call(); -PJ_DECL(void) send_request(char *cstr_method, const pj_str_t *dst_uri); -PJ_DECL(void) log_call_dump(int call_id); -PJ_DECL(int) write_settings(pjsua_app_config *cfg, char *buf, pj_size_t max); -PJ_DECL(void) app_config_init_video(pjsua_acc_config *acc_cfg); -PJ_DECL(void) arrange_window(pjsua_vid_win_id wid); +int my_atoi(const char *cs); +pj_bool_t find_next_call(); +pj_bool_t find_prev_call(); +void send_request(char *cstr_method, const pj_str_t *dst_uri); +void log_call_dump(int call_id); +int write_settings(pjsua_app_config *cfg, char *buf, pj_size_t max); +void app_config_init_video(pjsua_acc_config *acc_cfg); +void arrange_window(pjsua_vid_win_id wid); /** Defined in pjsua_cli_cmd.c **/ -PJ_DECL(pj_bool_t) is_cli_inited(); +pj_bool_t is_cli_inited(); /** Defined in pjsua_config.c **/ /** This is to load the configuration **/ -PJ_DECL(pj_status_t) load_config(int argc, - char **argv, - pj_str_t *uri_arg); +pj_status_t load_config(int argc, char **argv, pj_str_t *uri_arg); /** Pjsua app callback **/ /** This callback is called when CLI is started. **/ -PJ_DECL(void) cli_on_started(pj_status_t status); +void cli_on_started(pj_status_t status); /** This callback is called when "shutdown"/"restart" command is invoked **/ -PJ_DECL(pj_bool_t) cli_on_stopped(pj_bool_t restart, int argc, char **argv); +void cli_on_stopped(pj_bool_t restart, int argc, char **argv); /** This callback is called when "quit"/"restart" command is invoked **/ -PJ_DECL(pj_bool_t) legacy_on_stopped(pj_bool_t restart); +void legacy_on_stopped(pj_bool_t restart); /** Pjsua cli method **/ -PJ_DECL(pj_status_t) cli_init(); -PJ_DECL(pj_status_t) cli_main(pj_bool_t wait_telnet_cli); -PJ_DECL(void) cli_destroy(); -PJ_DECL(void) cli_get_info(char *info, pj_size_t size); +pj_status_t cli_init(); +pj_status_t cli_main(pj_bool_t wait_telnet_cli); +void cli_destroy(); +void cli_get_info(char *info, pj_size_t size); /** Legacy method **/ -PJ_DECL(void) legacy_main(); +void legacy_main(); #if PJSUA_HAS_VIDEO -PJ_DECL(void) vid_print_dev(int id, const pjmedia_vid_dev_info *vdi, - const char *title); -PJ_DECL(void) vid_list_devs(); -PJ_DECL(void) app_config_show_video(int acc_id, - const pjsua_acc_config *acc_cfg); +void vid_print_dev(int id, const pjmedia_vid_dev_info *vdi, const char *title); +void vid_list_devs(); +void app_config_show_video(int acc_id, const pjsua_acc_config *acc_cfg); #endif #ifdef HAVE_MULTIPART_TEST @@ -217,7 +213,7 @@ PJ_DECL(void) app_config_show_video(int acc_id, * Enable multipart in msg_data and add a dummy body into the * multipart bodies. */ - PJ_DECL(void) add_multipart(pjsua_msg_data *msg_data); + void add_multipart(pjsua_msg_data *msg_data); # define TEST_MULTIPART(msg_data) add_multipart(msg_data) #else # define TEST_MULTIPART(msg_data) @@ -226,5 +222,5 @@ PJ_DECL(void) app_config_show_video(int acc_id, PJ_END_DECL -#endif /* __PJSUA_COMMON_H__ */ +#endif /* __PJSUA_APP_COMMON_H__ */ diff --git a/pjsip-apps/src/pjsua/pjsua_config.c b/pjsip-apps/src/pjsua/pjsua_app_config.c index 0959e7ea..0cf8512c 100644 --- a/pjsip-apps/src/pjsua/pjsua_config.c +++ b/pjsip-apps/src/pjsua/pjsua_app_config.c @@ -17,9 +17,9 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "pjsua_common.h" +#include "pjsua_app_common.h" -#define THIS_FILE "pjsua_config.c" +#define THIS_FILE "pjsua_app_config.c" #define MAX_APP_OPTIONS 128 @@ -1478,7 +1478,7 @@ static pj_status_t parse_config(int argc, char *argv[], pj_str_t *uri_arg) return status; } -PJ_DEF(pj_status_t) load_config(int argc, +pj_status_t load_config(int argc, char **argv, pj_str_t *uri_arg) { @@ -1726,7 +1726,7 @@ static void write_account_settings(int acc_index, pj_str_t *result) /* * Write settings. */ -PJ_DEF(int) write_settings(pjsua_app_config *config, char *buf, pj_size_t max) +int write_settings(pjsua_app_config *config, char *buf, pj_size_t max) { unsigned acc_index; unsigned i; diff --git a/pjsip-apps/src/pjsua/pjsua_legacy.c b/pjsip-apps/src/pjsua/pjsua_app_legacy.c index 0818aa86..c3d9af1c 100644 --- a/pjsip-apps/src/pjsua/pjsua_legacy.c +++ b/pjsip-apps/src/pjsua/pjsua_app_legacy.c @@ -19,9 +19,9 @@ */ #include <pjsua-lib/pjsua.h> -#include "pjsua_common.h" +#include "pjsua_app_common.h" -#define THIS_FILE "pjsua_legacy.c" +#define THIS_FILE "pjsua_app_legacy.c" static pj_bool_t cmd_echo; @@ -1669,7 +1669,7 @@ static void ui_call_redirect(char menuin[]) /* * Main "user interface" loop. */ -PJ_DEF(void) legacy_main() +void legacy_main() { char menuin[80]; char buf[128]; |