summaryrefslogtreecommitdiff
path: root/include/asterisk
diff options
context:
space:
mode:
authorSean Bright <sean@malleable.com>2008-08-10 21:10:04 +0000
committerSean Bright <sean@malleable.com>2008-08-10 21:10:04 +0000
commit7a636521b16f193c5966ff8d25d205d831b77f0b (patch)
treee5fe0bde9f2df3d2cc509f285c65cd232417974d /include/asterisk
parent74bf61579f44098c5f218fb43f7674153e4dc3eb (diff)
Fix this again so we can compile with shadow warnings enabled and IMAP chosen
in voicemail. git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@137112 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'include/asterisk')
-rw-r--r--include/asterisk/channel.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/include/asterisk/channel.h b/include/asterisk/channel.h
index 9356bd84f..95bc7c08b 100644
--- a/include/asterisk/channel.h
+++ b/include/asterisk/channel.h
@@ -1510,16 +1510,16 @@ static inline int ast_add_fd(struct pollfd *pfd, int fd)
}
/*! \brief Helper function for migrating select to poll */
-static inline int ast_fdisset(struct pollfd *pfds, int fd, int max, int *start)
+static inline int ast_fdisset(struct pollfd *pfds, int fd, int maximum, int *start)
{
int x;
- int dummy=0;
+ int dummy = 0;
if (fd < 0)
return 0;
if (!start)
start = &dummy;
- for (x = *start; x<max; x++)
+ for (x = *start; x < maximum; x++)
if (pfds[x].fd == fd) {
if (x == *start)
(*start)++;