diff options
| author | phintuka <phintuka> | 2008-10-18 11:37:06 +0000 |
|---|---|---|
| committer | phintuka <phintuka> | 2008-10-18 11:37:06 +0000 |
| commit | 4f6398ae88b61f90d44cfdf50e6d66ee27c71042 (patch) | |
| tree | ca08ce61b47a0b1885a1eb5ed604b5017ae2c5e7 /xine_input_vdr.c | |
| parent | c5994e6ed1800cc8e5ccbb799aa9259aef03c0f7 (diff) | |
| download | xineliboutput-4f6398ae88b61f90d44cfdf50e6d66ee27c71042.tar.gz xineliboutput-4f6398ae88b61f90d44cfdf50e6d66ee27c71042.tar.bz2 | |
Merge from 1.0.3:
Fixed MIN/MAX for MAC OS X
(Thanks to Tero Siironen)
Diffstat (limited to 'xine_input_vdr.c')
| -rw-r--r-- | xine_input_vdr.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/xine_input_vdr.c b/xine_input_vdr.c index 955e6d7d..9d2d14ef 100644 --- a/xine_input_vdr.c +++ b/xine_input_vdr.c @@ -4,7 +4,7 @@ * See the main source file 'xineliboutput.c' for copyright information and * how to reach the author. * - * $Id: xine_input_vdr.c,v 1.183 2008-10-04 06:55:41 phintuka Exp $ + * $Id: xine_input_vdr.c,v 1.184 2008-10-18 11:37:06 phintuka Exp $ * */ @@ -905,8 +905,10 @@ static void scr_tunning_set_paused(vdr_input_plugin_t *this, /******************************* TOOLS ***********************************/ -#ifndef __APPLE__ +#ifndef MIN # define MIN(a,b) ((a)<(b)?(a):(b)) +#endif +#ifndef MAX # define MAX(a,b) ((a)>(b)?(a):(b)) #endif |