diff options
| author | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-01-07 21:17:43 +0000 |
|---|---|---|
| committer | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-01-07 21:17:43 +0000 |
| commit | 6adf679c4a4129a932530fc3c8e9f84723278e1f (patch) | |
| tree | e2c831645a0122279b528b8fde832b74dd044797 /channels/chan_alsa.c | |
| parent | efeb7fbc91ab2ac9b476f143babd7fe450c1f796 (diff) | |
Merged revisions 209400 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
........
r209400 | kpfleming | 2009-07-28 08:49:46 -0500 (Tue, 28 Jul 2009) | 3 lines
Define side-effect-safe MIN and MAX macros and remove duplicate definitions from various files.
(closes issue #16251)
Reported by: asgaroth
........
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@238499 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels/chan_alsa.c')
| -rw-r--r-- | channels/chan_alsa.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/channels/chan_alsa.c b/channels/chan_alsa.c index 161093e85..0765308c9 100644 --- a/channels/chan_alsa.c +++ b/channels/chan_alsa.c @@ -591,9 +591,6 @@ static struct ast_channel *alsa_request(const char *type, int fmt, void *data, i static char *autoanswer_complete(const char *line, const char *word, int pos, int state) { -#ifndef MIN -#define MIN(a,b) ((a) < (b) ? (a) : (b)) -#endif switch (state) { case 0: if (!ast_strlen_zero(word) && !strncasecmp(word, "on", MIN(strlen(word), 2))) |