diff --git a/apps/app_osplookup.c b/apps/app_osplookup.c index 14cfdcb598890f7c3ca1e5e24e168292efe0c1a7..f857164db4bdc273bbfeea2b477a8e46c6dbbad2 100644 --- a/apps/app_osplookup.c +++ b/apps/app_osplookup.c @@ -162,7 +162,7 @@ static int ospauth_exec(struct ast_channel *chan, void *data) } } ast_log(LOG_DEBUG, "OSPAuth: source '%s'\n", source); - ast_log(LOG_DEBUG, "OSPAuth: token size '%d'\n", strlen(token)); + ast_log(LOG_DEBUG, "OSPAuth: token size '%zd'\n", strlen(token)); res = ast_osp_auth(provider, &handle, source, chan->cid.cid_num, chan->exten, token, &timelimit); if (res > 0) { @@ -294,11 +294,11 @@ static int osplookup_exec(struct ast_channel *chan, void *data) pbx_builtin_setvar_helper(chan, "OSPCALLING", result.calling); ast_log(LOG_DEBUG, "OSPLookup: OSPCALLING '%s'\n", result.calling); pbx_builtin_setvar_helper(chan, "OSPOUTTOKEN", result.token); - ast_log(LOG_DEBUG, "OSPLookup: OSPOUTTOKEN size '%d'\n", strlen(result.token)); + ast_log(LOG_DEBUG, "OSPLookup: OSPOUTTOKEN size '%zd'\n", strlen(result.token)); if (!ast_strlen_zero(result.token)) { snprintf(buffer, sizeof(buffer), "P-OSP-Auth-Token: %s", result.token); pbx_builtin_setvar_helper(chan, "_SIPADDHEADER", buffer); - ast_log(LOG_DEBUG, "OSPLookup: SIPADDHEADER size '%d'\n", strlen(buffer)); + ast_log(LOG_DEBUG, "OSPLookup: SIPADDHEADER size '%zd'\n", strlen(buffer)); } snprintf(buffer, sizeof(buffer), "%d", result.numresults); pbx_builtin_setvar_helper(chan, "OSPRESULTS", buffer); @@ -440,11 +440,11 @@ static int ospnext_exec(struct ast_channel *chan, void *data) pbx_builtin_setvar_helper(chan, "OSPCALLING", result.calling); ast_log(LOG_DEBUG, "OSPNext: OSPCALLING '%s'\n", result.calling); pbx_builtin_setvar_helper(chan, "OSPOUTTOKEN", result.token); - ast_log(LOG_DEBUG, "OSPNext: OSPOUTTOKEN size '%d'\n", strlen(result.token)); + ast_log(LOG_DEBUG, "OSPNext: OSPOUTTOKEN size '%zd'\n", strlen(result.token)); if (!ast_strlen_zero(result.token)) { snprintf(buffer, sizeof(buffer), "P-OSP-Auth-Token: %s", result.token); pbx_builtin_setvar_helper(chan, "_SIPADDHEADER", buffer); - ast_log(LOG_DEBUG, "OSPNext: SIPADDHEADER size '%d'\n", strlen(buffer)); + ast_log(LOG_DEBUG, "OSPNext: SIPADDHEADER size '%zd'\n", strlen(buffer)); } snprintf(buffer, sizeof(buffer), "%d", result.numresults); pbx_builtin_setvar_helper(chan, "OSPRESULTS", buffer); diff --git a/codecs/lpc10/lpc10.h b/codecs/lpc10/lpc10.h index db7c25ad9156e5be073eb509126fd0175c8222a9..a57f84f3fe3beac3e379245a2120269b4d071149 100644 --- a/codecs/lpc10/lpc10.h +++ b/codecs/lpc10/lpc10.h @@ -31,6 +31,8 @@ Add broken lpc10 code... It's not too far from working I don't think... #ifndef __LPC10_H__ #define __LPC10_H__ +#define P_R_O_T_O_T_Y_P_E_S + #define LPC10_SAMPLES_PER_FRAME 180 #define LPC10_BITS_IN_COMPRESSED_FRAME 54 diff --git a/codecs/lpc10/lpcini.c b/codecs/lpc10/lpcini.c index 12880466fd98bb7e186a876f646c1c717f1fe920..b8dba94f549b773492ecf045af47deee0f985131 100644 --- a/codecs/lpc10/lpcini.c +++ b/codecs/lpc10/lpcini.c @@ -29,13 +29,6 @@ Some OSS fixes and a few lpc changes to make it actually work */ -#ifdef P_R_O_T_O_T_Y_P_E_S -extern int lpcini_(void); -/* comlen contrl_ 12 */ -/*:ref: initlpcenc_ 14 0 */ -/*:ref: initlpcdec_ 14 0 */ -#endif - /* -- translated by f2c (version 19951025). You must link the resulting object file with the libraries: -lf2c -lm (in that order) @@ -44,6 +37,13 @@ extern int lpcini_(void); #include <stdlib.h> #include "f2c.h" +#ifdef P_R_O_T_O_T_Y_P_E_S +extern int lpcini_(void); +/* comlen contrl_ 12 */ +/*:ref: initlpcenc_ 14 0 */ +/*:ref: initlpcdec_ 14 0 */ +#endif + /* Common Block Declarations */ struct {