Index: app.c =================================================================== RCS file: /usr/cvsroot/asterisk/app.c,v retrieving revision 1.60 diff -u -r1.60 app.c --- app.c 4 May 2005 15:26:03 -0000 1.60 +++ app.c 21 May 2005 09:21:21 -0000 @@ -271,7 +271,7 @@ if (!res) { res = ast_waitfor(chan,100); if (res > -1) { - for (ptr=digits;*ptr;*ptr++) { + for (ptr=digits; *ptr; ptr++) { if (*ptr == 'w') { res = ast_safe_sleep(chan, 500); if (res) Index: config.c =================================================================== RCS file: /usr/cvsroot/asterisk/config.c,v retrieving revision 1.62 diff -u -r1.62 config.c --- config.c 8 May 2005 17:31:09 -0000 1.62 +++ config.c 21 May 2005 09:21:23 -0000 @@ -486,7 +486,7 @@ /* #exec We create a tmp file, then we #include it, then we delete it. */ if (do_exec) { - snprintf(exec_file, sizeof(exec_file), "/var/tmp/exec.%ld.%ld", time(NULL), pthread_self()); + snprintf(exec_file, sizeof(exec_file), "/var/tmp/exec.%ld.%ld", time(NULL), (long)pthread_self()); snprintf(cmd, sizeof(cmd), "%s > %s 2>&1", cur, exec_file); ast_safe_system(cmd); cur = exec_file; Index: apps/app_controlplayback.c =================================================================== RCS file: /usr/cvsroot/asterisk/apps/app_controlplayback.c,v retrieving revision 1.9 diff -u -r1.9 app_controlplayback.c --- apps/app_controlplayback.c 21 Apr 2005 06:02:43 -0000 1.9 +++ apps/app_controlplayback.c 21 May 2005 09:21:25 -0000 @@ -65,24 +65,19 @@ file = tmp; if ((skip=strchr(tmp,'|'))) { - *skip = '\0'; - *skip++; + *skip++ = '\0'; fwd=strchr(skip,'|'); if (fwd) { - *fwd = '\0'; - *fwd++; + *fwd++ = '\0'; rev = strchr(fwd,'|'); if (rev) { - *rev = '\0'; - *rev++; + *rev++ = '\0'; stop = strchr(rev,'|'); if (stop) { - *stop = '\0'; - *stop++; + *stop++ = '\0'; pause = strchr(stop,'|'); if (pause) { - *pause = '\0'; - *pause++; + *pause++ = '\0'; } } } Index: apps/app_dictate.c =================================================================== RCS file: /usr/cvsroot/asterisk/apps/app_dictate.c,v retrieving revision 1.1 diff -u -r1.1 app_dictate.c --- apps/app_dictate.c 4 May 2005 19:33:33 -0000 1.1 +++ apps/app_dictate.c 21 May 2005 09:21:26 -0000 @@ -16,7 +16,7 @@ #include #include #include - +#include /* for mkdir */ #include "asterisk/file.h" #include "asterisk/logger.h" #include "asterisk/channel.h" Index: apps/app_flash.c =================================================================== RCS file: /usr/cvsroot/asterisk/apps/app_flash.c,v retrieving revision 1.4 diff -u -r1.4 app_flash.c --- apps/app_flash.c 21 Apr 2005 06:02:43 -0000 1.4 +++ apps/app_flash.c 21 May 2005 09:21:26 -0000 @@ -11,6 +11,9 @@ * the GNU General Public License */ +#include +#include +#include #include "asterisk/lock.h" #include "asterisk/file.h" #include "asterisk/logger.h" @@ -26,9 +29,6 @@ #else #include #endif /* __linux__ */ -#include -#include -#include static char *tdesc = "Flash zap trunk application"; Index: channels/chan_zap.c =================================================================== RCS file: /usr/cvsroot/asterisk/channels/chan_zap.c,v retrieving revision 1.448 diff -u -r1.448 chan_zap.c --- channels/chan_zap.c 20 May 2005 19:09:21 -0000 1.448 +++ channels/chan_zap.c 21 May 2005 09:21:45 -0000 @@ -267,6 +267,8 @@ #ifdef PRI_GETSET_TIMERS static int pritimers[PRI_MAX_TIMERS]; #endif +static int pridebugfd = -1; +static char pridebugfilename[1024]=""; #endif /* Wait up to 16 seconds for first digit (FXO logic) */ @@ -288,8 +290,6 @@ static int ifcount = 0; AST_MUTEX_DEFINE_STATIC(pridebugfdlock); -static int pridebugfd = -1; -static char pridebugfilename[1024]=""; /* Whether we answer on a Polarity Switch event */ static int answeronpolarityswitch = 0; Index: channels/iax2-parser.c =================================================================== RCS file: /usr/cvsroot/asterisk/channels/iax2-parser.c,v retrieving revision 1.43 diff -u -r1.43 iax2-parser.c --- channels/iax2-parser.c 17 May 2005 19:41:09 -0000 1.43 +++ channels/iax2-parser.c 21 May 2005 09:21:46 -0000 @@ -119,7 +119,8 @@ tm.tm_mday = (val >> 16) & 0x1f; tm.tm_mon = ((val >> 21) & 0x0f) - 1; tm.tm_year = ((val >> 25) & 0x7f) + 100; - strftime(output, maxlen, "%F %T", &tm); + /* XXX gcc does not like %F so use %Y-%m-%d */ + strftime(output, maxlen, "%Y-%m-%d %T", &tm); } else ast_copy_string(output, "Invalid DATETIME format!", maxlen); } Index: codecs/gsm/src/preprocess.c =================================================================== RCS file: /usr/cvsroot/asterisk/codecs/gsm/src/preprocess.c,v retrieving revision 1.17 diff -u -r1.17 preprocess.c --- codecs/gsm/src/preprocess.c 21 Apr 2005 06:30:23 -0000 1.17 +++ codecs/gsm/src/preprocess.c 21 May 2005 09:21:46 -0000 @@ -45,8 +45,9 @@ word SO; - +#if 0 /* unused */ ulongword utmp; /* for L_ADD */ +#endif register int k = 160; Index: codecs/gsm/src/short_term.c =================================================================== RCS file: /usr/cvsroot/asterisk/codecs/gsm/src/short_term.c,v retrieving revision 1.17 diff -u -r1.17 short_term.c --- codecs/gsm/src/short_term.c 21 Apr 2005 06:30:23 -0000 1.17 +++ codecs/gsm/src/short_term.c 21 May 2005 09:21:46 -0000 @@ -373,7 +373,9 @@ word * LARpp_j_1 = S->LARpp[ S->j ^= 1 ]; word LARp[8]; +#if 0 /* unused */ int i; +#endif #undef FILTER #if defined(FAST) && defined(USE_FLOAT_MUL) # define FILTER (* (S->fast \ Index: include/asterisk/utils.h =================================================================== RCS file: /usr/cvsroot/asterisk/include/asterisk/utils.h,v retrieving revision 1.31 diff -u -r1.31 utils.h --- include/asterisk/utils.h 20 May 2005 16:30:13 -0000 1.31 +++ include/asterisk/utils.h 21 May 2005 09:21:50 -0000 @@ -197,10 +197,12 @@ (ra)->ptr; \ }) +#if 0 #ifdef inet_ntoa #undef inet_ntoa #endif #define inet_ntoa __dont__use__inet_ntoa__use__ast_inet_ntoa__instead__ +#endif #define AST_STACKSIZE 256 * 1024 #define ast_pthread_create(a,b,c,d) ast_pthread_create_stack(a,b,c,d,0) Index: res/Makefile =================================================================== RCS file: /usr/cvsroot/asterisk/res/Makefile,v retrieving revision 1.21 diff -u -r1.21 Makefile --- res/Makefile 20 May 2005 03:18:35 -0000 1.21 +++ res/Makefile 21 May 2005 09:21:50 -0000 @@ -36,6 +36,10 @@ rm -f $(DESTDIR)$(MODULES_DIR)/res_parking.so for x in $(MODS); do $(INSTALL) -m 755 $$x $(DESTDIR)$(MODULES_DIR) ; done +res_crypto.o: res_crypto.c + echo "--- compiling crypto.c " + $(CC) -c ${CFLAGS:-Werror=} $< + res_crypto.so: res_crypto.o $(CC) $(SOLINK) -o $@ $< $(CRYPTO_LIBS)