[asterisk-commits] twilson: trunk r323864 - in /trunk: ./ include/asterisk/utils.h

[SVN commits to the Asterisk project]

Author: twilson
Date: Wed Jun 15 15:02:30 2011
New Revision: 323864

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

........
  r323863 | twilson | 2011-06-15 14:58:18 -0500 (Wed, 15 Jun 2011) | 2 lines
  
  Make ARRAY_LEN() return the same type on x86 and x86_64 systems
........

Modified:
    trunk/   (props changed)
    trunk/include/asterisk/utils.h

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

Modified: trunk/include/asterisk/utils.h
URL: http://svnview.digium.com/svn/asterisk/trunk/include/asterisk/utils.h?view=diff&rev=323864&r1=323863&r2=323864
==============================================================================
--- trunk/include/asterisk/utils.h (original)
+++ trunk/include/asterisk/utils.h Wed Jun 15 15:02:30 2011
@@ -682,7 +682,7 @@
  */
 int ast_mkdir(const char *path, int mode);
 
-#define ARRAY_LEN(a) (sizeof(a) / sizeof(0[a]))
+#define ARRAY_LEN(a) (size_t) (sizeof(a) / sizeof(0[a]))
 
 
 /* Definition for Digest authorization */