diff options
author | Benny Prijono <bennylp@teluu.com> | 2006-02-07 21:13:28 +0000 |
---|---|---|
committer | Benny Prijono <bennylp@teluu.com> | 2006-02-07 21:13:28 +0000 |
commit | 0b4ee7092fc7ef0c8e617a7b6066f84b7c039301 (patch) | |
tree | 077483dea5667d444498ab4efa6077ad1be9b289 /pjsip | |
parent | eab36ad92eda60b3511636894457fb77ddaa2537 (diff) |
Renamed pjsua.c to pjsua_core.c since it is causing link problems with gcc
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@147 74dad513-b988-da41-8d7b-12977e46ad98
Diffstat (limited to 'pjsip')
-rw-r--r-- | pjsip/build/Makefile | 2 | ||||
-rw-r--r-- | pjsip/build/pjsua.dsp | 9 | ||||
-rw-r--r-- | pjsip/src/pjsua/main.c | 8 | ||||
-rw-r--r-- | pjsip/src/pjsua/pjsua.h | 9 | ||||
-rw-r--r-- | pjsip/src/pjsua/pjsua_core.c (renamed from pjsip/src/pjsua/pjsua.c) | 0 |
5 files changed, 16 insertions, 12 deletions
diff --git a/pjsip/build/Makefile b/pjsip/build/Makefile index 5be4a877..6787c30e 100644 --- a/pjsip/build/Makefile +++ b/pjsip/build/Makefile @@ -54,7 +54,7 @@ export PJSIP_UA_CFLAGS += $(_CFLAGS) # export PJSUA_SRCDIR = ../src/pjsua export PJSUA_OBJS += $(OS_OBJS) $(M_OBJS) $(CC_OBJS) $(HOST_OBJS) \ - main.o pjsua_reg.o pjsua.o + main.o pjsua_reg.o pjsua_core.o export PJSUA_CFLAGS += $(_CFLAGS) export PJSUA_LDFLAGS += $(_LDFLAGS) export PJSUA_EXE:=../bin/pjsua-$(MACHINE_NAME)-$(OS_NAME)-$(CC_NAME)$(HOST_EXE) diff --git a/pjsip/build/pjsua.dsp b/pjsip/build/pjsua.dsp index 1835b000..b5787bd1 100644 --- a/pjsip/build/pjsua.dsp +++ b/pjsip/build/pjsua.dsp @@ -95,13 +95,6 @@ SOURCE=..\src\pjsua\getopt.c # Begin Source File
SOURCE=..\src\pjsua\main.c
-
-!IF "$(CFG)" == "pjsua - Win32 Release"
-
-!ELSEIF "$(CFG)" == "pjsua - Win32 Debug"
-
-!ENDIF
-
# End Source File
# Begin Source File
@@ -123,7 +116,7 @@ SOURCE=..\src\pjsua\misc.c # End Source File
# Begin Source File
-SOURCE=..\src\pjsua\pjsua.c
+SOURCE=..\src\pjsua\pjsua_core.c
# End Source File
# Begin Source File
diff --git a/pjsip/src/pjsua/main.c b/pjsip/src/pjsua/main.c index f98ce0bd..68140d4a 100644 --- a/pjsip/src/pjsua/main.c +++ b/pjsip/src/pjsua/main.c @@ -71,6 +71,7 @@ static void ui_help(void) puts(" h Hangup current call"); puts(" q Quit"); puts(""); + fflush(stdout); } static void ui_console_main(void) @@ -100,16 +101,18 @@ static void ui_console_main(void) case 'm': if (inv_session != NULL) { puts("Can not make call while another one is in progress"); + fflush(stdout); continue; } #if 1 - printf("Enter URL to call: "); + printf("Enter URL to call: "); fflush(stdout); fgets(buf, sizeof(buf), stdin); if (buf[0]=='\r' || buf[0]=='\n') { /* Cancelled. */ puts("<cancelled>"); + fflush(stdout); continue; } @@ -133,6 +136,7 @@ static void ui_console_main(void) if (inv_session == NULL) { puts("No current call"); + fflush(stdout); continue; } else { @@ -384,6 +388,7 @@ static int read_config_file(pj_pool_t *pool, const char *filename, fhnd = fopen(filename, "rt"); if (!fhnd) { printf("Unable to open config file %s\n", filename); + fflush(stdout); return -1; } @@ -416,6 +421,7 @@ static int read_config_file(pj_pool_t *pool, const char *filename, if (argc == MAX_ARGS && (i!=*app_argc || !feof(fhnd))) { printf("Too many arguments specified in cmd line/config file\n"); + fflush(stdout); fclose(fhnd); return -1; } diff --git a/pjsip/src/pjsua/pjsua.h b/pjsip/src/pjsua/pjsua.h index 30f61f61..53b46e58 100644 --- a/pjsip/src/pjsua/pjsua.h +++ b/pjsip/src/pjsua/pjsua.h @@ -35,8 +35,10 @@ #include <pjlib.h> +PJ_BEGIN_DECL + /* PJSUA application variables. */ -extern struct pjsua_t +struct pjsua_t { /* Control: */ @@ -109,8 +111,9 @@ extern struct pjsua_t unsigned log_decor; /**< Log decoration. */ char *log_filename; /**< Log filename. */ -} pjsua; +}; +extern struct pjsua_t pjsua; /***************************************************************************** * PJSUA API. @@ -193,4 +196,6 @@ void pjsua_regc_update(pj_bool_t renew); void pjsua_ui_inv_on_state_changed(pjsip_inv_session *inv, pjsip_event *e); +PJ_END_DECL + #endif /* __PJSUA_H__ */ diff --git a/pjsip/src/pjsua/pjsua.c b/pjsip/src/pjsua/pjsua_core.c index dd4c0c57..dd4c0c57 100644 --- a/pjsip/src/pjsua/pjsua.c +++ b/pjsip/src/pjsua/pjsua_core.c |