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_usbradio.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_usbradio.c')
| -rw-r--r-- | channels/chan_usbradio.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/channels/chan_usbradio.c b/channels/chan_usbradio.c index 9e5adb223..f7b2066ce 100644 --- a/channels/chan_usbradio.c +++ b/channels/chan_usbradio.c @@ -351,13 +351,6 @@ END_CONFIG #define DEV_DSP "/dev/dsp" #endif -#ifndef MIN -#define MIN(a,b) ((a) < (b) ? (a) : (b)) -#endif -#ifndef MAX -#define MAX(a,b) ((a) > (b) ? (a) : (b)) -#endif - static const char *config = "usbradio.conf"; /* default config file */ #define config1 "usbradio_tune_%s.conf" /* tune config file */ |