[MPlayer-dev-eng] libavcodec fix proposal (FreeBSD)

Bohdan Horst nexus at hoth.amu.edu.pl
Tue Jul 23 11:22:28 CEST 2002


--- common.h  Sat Jul 20 12:13:43 2002
+++ common.h  Tue Jul 23 11:11:24 2002
@@ -109,10 +109,6 @@

 #ifdef HAVE_AV_CONFIG_H

-#ifdef __FreeBSD__
-#include <sys/param.h>
-#endif
-
 #ifndef INT64_C
 #define INT64_C(c)     (c ## LL)
 #define UINT64_C(c)    (c ## ULL)




this include isn;t longer need and now generate a lot of warnings:

In file included from avcodec.h:4,
                 from allcodecs.c:19:
common.h:167: warning: `MAX' redefined
/usr/include/sys/param.h:214: warning: this is the location of the previous definition
common.h:168: warning: `MIN' redefined
/usr/include/sys/param.h:213: warning: this is the location of the previous definition



in /usr/include/sys/param.h:
#define MIN(a,b) (((a)<(b))?(a):(b))
#define MAX(a,b) (((a)>(b))?(a):(b))


in common.h:
#define MAX(a,b) ((a) > (b) ? (a) : (b))
#define MIN(a,b) ((a) > (b) ? (b) : (a))


best regards

-- 
 / irl:Bohdan 'Nexus' Horst | mailto:nexus at irc.pl | irc:Nexus \
{---------------------------^----------v----------^------------}
 \ http://www.physd.amu.edu.pl/~nexus/ | Instytut Fizyki  UAM /



More information about the MPlayer-dev-eng mailing list