D�but du portage BeOS. Beaucoup de fuchiers ont �t� modifi� car il a fallu

[vlc] / include / common.h

diff --git a/include/common.h b/include/common.h
index cc49cd53525576b5261f4d840ff082027858b156..e9e105df42d86420ca7b1d579e9e61f2346679ea 100644 (file)
--- a/include/common.h
+++ b/include/common.h
@@ -103,8 +103,12 @@ typedef struct video_parser_s *         p_video_parser_t;
 #define PAD(n, d)   ( ((n) % (d)) ? ((((n) / (d)) + 1) * (d)) : (n) )
 
 /* MAX and MIN: self explanatory */
+#ifndef MAX
 #define MAX(a, b)   ( ((a) > (b)) ? (a) : (b) )
+#endif
+#ifndef MIN
 #define MIN(a, b)   ( ((a) < (b)) ? (a) : (b) )
+#endif
 
 /* MSB (big endian)/LSB (little endian) convertions - network order is always
  * MSB, and should be used for both network communications and files. Note that