From: Terry Wilson <twilson@digium.com>
Date: Wed, 15 Jun 2011 20:02:30 +0000 (+0000)
Subject: Merged revisions 323863 via svnmerge from
X-Git-Tag: 11.0.0-beta1~1460
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0fccd77f47f07a335a2cd1d0f82c734000e47fe2;p=thirdparty%2Fasterisk.git

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
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@323864 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/include/asterisk/utils.h b/include/asterisk/utils.h
index 823af26c40..44eeb5f8ed 100644
--- a/include/asterisk/utils.h
+++ b/include/asterisk/utils.h
@@ -682,7 +682,7 @@ void ast_enable_packet_fragmentation(int sock);
  */
 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 */