[asterisk-commits] twilson: trunk r320717 - in /trunk: ./ addons/chan_mobile.c

[SVN commits to the Asterisk project]

Author: twilson
Date: Tue May 24 19:52:21 2011
New Revision: 320717

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=320717
Log:
Merged revisions 320716 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r320716 | twilson | 2011-05-24 17:49:10 -0700 (Tue, 24 May 2011) | 4 lines
  
  Cast data as char * before using S_OR
  
  This is required for compiling successfully under dev mode
........

Modified:
    trunk/   (props changed)
    trunk/addons/chan_mobile.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.8-merged' - no diff available.

Modified: trunk/addons/chan_mobile.c
URL: http://svnview.digium.com/svn/asterisk/trunk/addons/chan_mobile.c?view=diff&rev=320717&r1=320716&r2=320717
==============================================================================
--- trunk/addons/chan_mobile.c (original)
+++ trunk/addons/chan_mobile.c Tue May 24 19:52:21 2011
@@ -1185,7 +1185,7 @@
 	int res = AST_DEVICE_INVALID;
 	struct mbl_pvt *pvt;
 
-	device = ast_strdupa(S_OR(data, ""));
+	device = ast_strdupa(S_OR((char *) data, ""));
 
 	ast_debug(1, "Checking device state for device %s\n", device);