[svn-commits] mvanbaak: branch 1.6.0 r135060 - in /branches/1.6.0: ./ apps/app_ices.c

[SVN commits to the Digium repositories]

Author: mvanbaak
Date: Fri Aug  1 06:57:38 2008
New Revision: 135060

URL: http://svn.digium.com/view/asterisk?view=rev&rev=135060
Log:
Merged revisions 135059 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

................
r135059 | mvanbaak | 2008-08-01 13:47:34 +0200 (Fri, 01 Aug 2008) | 10 lines

Merged revisions 135058 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r135058 | mvanbaak | 2008-08-01 13:43:46 +0200 (Fri, 01 Aug 2008) | 2 lines

make app_ices compile on OpenBSD.

........

................

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/apps/app_ices.c

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.0/apps/app_ices.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/apps/app_ices.c?view=diff&rev=135060&r1=135059&r2=135060
==============================================================================
--- branches/1.6.0/apps/app_ices.c (original)
+++ branches/1.6.0/apps/app_ices.c Fri Aug  1 06:57:38 2008
@@ -92,15 +92,15 @@
 	 * But many places has it in /usr/bin 
 	 * As a last-ditch effort, try to use PATH
 	 */
-	execl(path_LOCAL "ices2", "ices", filename, NULL);
-	execl(path_BIN "ices2", "ices", filename, NULL);
-	execlp("ices2", "ices", filename, NULL);
+	execl(path_LOCAL "ices2", "ices", filename, (char *)NULL);
+	execl(path_BIN "ices2", "ices", filename, (char *)NULL);
+	execlp("ices2", "ices", filename, (char *)NULL);
 
 	ast_debug(1, "Couldn't find ices version 2, attempting to use ices version 1.");
 
-	execl(path_LOCAL "ices", "ices", filename, NULL);
-	execl(path_BIN "ices", "ices", filename, NULL);
-	execlp("ices", "ices", filename, NULL);
+	execl(path_LOCAL "ices", "ices", filename, (char *)NULL);
+	execl(path_BIN "ices", "ices", filename, (char *)NULL);
+	execlp("ices", "ices", filename, (char *)NULL);
 
 	ast_log(LOG_WARNING, "Execute of ices failed, could not find command.\n");
 	close(fd);