[prev in list] [next in list] [prev in thread] [next in thread] 

List:       xine-cvslog
Subject:    [xine-cvs] HG: xine-lib: Remove MIN/MAX macro definitions on unit.
From:       "=?UTF-8?Q?Diego=20'Flameeyes'=20Petten=C3=B2?=" <flameeyes () gmail ! com>
Date:       2008-05-23 21:45:03
Message-ID: 965aea7ab1e11c9946af.1211578980 () hg ! debian ! org
[Download RAW message or body]

# HG changeset patch
# User Diego 'Flameeyes' Pettenò <flameeyes@gmail.com>
# Date 1211578980 -7200
# Node ID 965aea7ab1e11c9946af016b4f9c199a8bf75d16
# Parent  d212d807441e36dec408d30284c002a510cb493e
Remove MIN/MAX macro definitions on unit.

Now that the macro are either imported from the system or defined by
configure. don't define them in every source file.

diff -r 965aea7ab1e11c9946af016b4f9c199a8bf75d16 -r \
                d212d807441e36dec408d30284c002a510cb493e \
                src/demuxers/demux_matroska.c
--- a/src/demuxers/demux_matroska.c	Fri May 23 23:43:00 2008 +0200
+++ b/src/demuxers/demux_matroska.c	Fri May 23 23:31:33 2008 +0200
@@ -57,13 +57,6 @@
 #define MAX_FRAMES               32
 
 #define WRAP_THRESHOLD        90000
-
-#if !defined(MIN)
-#define MIN(a, b)	((a)<(b)?(a):(b))
-#endif
-#if !defined(MAX)
-#define MAX(a, b)	((a)>(b)?(a):(b))
-#endif
 
 typedef struct {
   int                  track_num;
diff -r 965aea7ab1e11c9946af016b4f9c199a8bf75d16 -r \
                d212d807441e36dec408d30284c002a510cb493e src/demuxers/demux_ts.c
--- a/src/demuxers/demux_ts.c	Fri May 23 23:43:00 2008 +0200
+++ b/src/demuxers/demux_ts.c	Fri May 23 23:31:33 2008 +0200
@@ -184,9 +184,6 @@
 #define INVALID_PID ((unsigned int)(-1))
 #define INVALID_PROGRAM ((unsigned int)(-1))
 #define INVALID_CC ((unsigned int)(-1))
-
-#define	MIN(a,b)   (((a)<(b))?(a):(b))
-#define	MAX(a,b)   (((a)>(b))?(a):(b))
 
 #define PROG_STREAM_MAP  0xBC
 #define PRIVATE_STREAM1  0xBD
diff -r 965aea7ab1e11c9946af016b4f9c199a8bf75d16 -r \
                d212d807441e36dec408d30284c002a510cb493e src/input/libreal/real.c
--- a/src/input/libreal/real.c	Fri May 23 23:43:00 2008 +0200
+++ b/src/input/libreal/real.c	Fri May 23 23:31:33 2008 +0200
@@ -47,9 +47,6 @@ static const unsigned char xor_table[] =
 
 #define _X_BE_32C(x,y) do { *(uint32_t *)(x) = be2me_32((y)); } while(0)
 #define _X_LE_32C(x,y) do { *(uint32_t *)(x) = le2me_32((y)); } while(0)
-
-#define MAX(x,y) ((x>y) ? x : y)
-
 
 static void hash(char *field, char *param) {
 
diff -r 965aea7ab1e11c9946af016b4f9c199a8bf75d16 -r \
                d212d807441e36dec408d30284c002a510cb493e src/libspucc/cc_decoder.c
--- a/src/libspucc/cc_decoder.c	Fri May 23 23:43:00 2008 +0200
+++ b/src/libspucc/cc_decoder.c	Fri May 23 23:31:33 2008 +0200
@@ -215,8 +215,6 @@ static const uint8_t *const cc_alpha_pal
 
 #define TRANSP_SPACE 0x19   /* code for transparent space, essentially 
 			       arbitrary */
-
-#define MAX(a, b) ((a) > (b)? (a) : (b))
 
 /* mapping from PAC row code to actual CC row */
 static const int  rowdata[] = {10, -1, 0, 1, 2, 3, 11, 12, 13, 14, 4, 5, 6,
diff -r 965aea7ab1e11c9946af016b4f9c199a8bf75d16 -r \
                d212d807441e36dec408d30284c002a510cb493e src/post/planar/unsharp.c
--- a/src/post/planar/unsharp.c	Fri May 23 23:43:00 2008 +0200
+++ b/src/post/planar/unsharp.c	Fri May 23 23:31:33 2008 +0200
@@ -25,13 +25,6 @@
 #include "post.h"
 #include "xineutils.h"
 #include <pthread.h>
-
-#ifndef MIN
-#define        MIN(a,b) (((a)<(b))?(a):(b))
-#endif
-#ifndef MAX
-#define        MAX(a,b) (((a)>(b))?(a):(b))
-#endif
 
 /*===========================================================================*/
 
diff -r 965aea7ab1e11c9946af016b4f9c199a8bf75d16 -r \
                d212d807441e36dec408d30284c002a510cb493e \
                src/video_out/video_out_directfb.c
--- a/src/video_out/video_out_directfb.c	Fri May 23 23:43:00 2008 +0200
+++ b/src/video_out/video_out_directfb.c	Fri May 23 23:31:33 2008 +0200
@@ -167,10 +167,6 @@ typedef struct {
                           "no-sighandler,"\
                           "no-deinit-check"
 
-
-#ifndef MAX
-# define MAX( a, b ) (((a) > (b)) ? (a) : (b))
-#endif
 
 #define YCBCR_TO_RGB( y, cb, cr, r, g, b ) \
   do { \
diff -r 965aea7ab1e11c9946af016b4f9c199a8bf75d16 -r \
                d212d807441e36dec408d30284c002a510cb493e src/video_out/yuv2rgb_mlib.c
--- a/src/video_out/yuv2rgb_mlib.c	Fri May 23 23:43:00 2008 +0200
+++ b/src/video_out/yuv2rgb_mlib.c	Fri May 23 23:31:33 2008 +0200
@@ -37,8 +37,6 @@
 #include "attributes.h"
 #include "xineutils.h"
 #include "yuv2rgb.h"
-
-#define	MIN(a, b) (((a) < (b)) ? (a) : (b))
 
 static void mlib_yuv420_rgb24(yuv2rgb_t *this,
 			      uint8_t * image, uint8_t * py,
diff -r 965aea7ab1e11c9946af016b4f9c199a8bf75d16 -r \
                d212d807441e36dec408d30284c002a510cb493e src/xine-engine/demux.c
--- a/src/xine-engine/demux.c	Fri May 23 23:43:00 2008 +0200
+++ b/src/xine-engine/demux.c	Fri May 23 23:31:33 2008 +0200
@@ -46,11 +46,6 @@
 #ifdef WIN32
 #include <winsock.h>
 #endif
-
-#ifdef MIN
-#undef MIN
-#endif
-#define MIN(a,b) ( (a) < (b) ) ? (a) : (b)
 
 /* 
  *  Flush audio and video buffers. It is called from demuxers on
diff -r 965aea7ab1e11c9946af016b4f9c199a8bf75d16 -r \
                d212d807441e36dec408d30284c002a510cb493e src/xine-engine/osd.c
--- a/src/xine-engine/osd.c	Fri May 23 23:43:00 2008 +0200
+++ b/src/xine-engine/osd.c	Fri May 23 23:31:33 2008 +0200
@@ -82,17 +82,6 @@
 #else
 #  define UCS2_ENCODING "UCS-2LE"
 #endif
-
-#ifdef MAX
-#undef MAX
-#endif
-#define MAX(a,b) ( (a) > (b) ) ? (a) : (b)
-
-#ifdef MIN
-#undef MIN
-#endif
-#define MIN(a,b) ( (a) < (b) ) ? (a) : (b)
-
 
 #if (FREETYPE_MAJOR > 2) || \
     (FREETYPE_MAJOR == 2 && FREETYPE_MINOR > 1) || \

-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Xine-cvslog mailing list
Xine-cvslog@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/xine-cvslog


[prev in list] [next in list] [prev in thread] [next in thread]