summaryrefslogtreecommitdiff
path: root/channels/chan_oss.c
diff options
context:
space:
mode:
authorKevin P. Fleming <kpfleming@digium.com>2009-07-28 13:49:46 +0000
committerKevin P. Fleming <kpfleming@digium.com>2009-07-28 13:49:46 +0000
commitba020fc3909c1b241358d789be991c039452749c (patch)
tree0325381f58fd6b2bc0bddffcc3e553dbd4f8ad8e /channels/chan_oss.c
parentb3090ee28a707aea02ec0dc1adc72dab66f17431 (diff)
Define side-effect-safe MIN and MAX macros and remove duplicate definitions from various files.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@209400 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'channels/chan_oss.c')
-rw-r--r--channels/chan_oss.c7
1 files changed, 0 insertions, 7 deletions
diff --git a/channels/chan_oss.c b/channels/chan_oss.c
index 9b2201a48..a58c4b6d4 100644
--- a/channels/chan_oss.c
+++ b/channels/chan_oss.c
@@ -229,13 +229,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 char *config = "oss.conf"; /* default config file */
static int oss_debug;