# HG changeset patch # User bellard # Date 1023802734 0 # Node ID 90227eb98bf95988bac1a69c191617e48d0c29e9 # Parent cee02f2f4a5ac1ebab1672ee262363cad8e83015 do not export internal functions - use stdint.h diff -r cee02f2f4a5a -r 90227eb98bf9 common.h --- a/common.h Sun Jun 09 14:04:36 2002 +0000 +++ b/common.h Tue Jun 11 13:38:54 2002 +0000 @@ -77,7 +77,7 @@ /* unix */ -#include +#include #ifndef __WINE_WINDEF16_H /* workaround for typedef conflict in MPlayer (wine typedefs) */ @@ -111,9 +111,9 @@ #endif /* !CONFIG_WIN32 */ -#include "bswap.h" +#ifdef HAVE_AV_CONFIG_H -#ifdef HAVE_AV_CONFIG_H +#include "bswap.h" #if defined(__MINGW32__) || defined(__CYGWIN__) || \ defined(__OS2__) || defined (__OpenBSD__) @@ -144,8 +144,6 @@ #endif /* !CONFIG_WIN32 */ -#endif /* HAVE_AV_CONFIG_H */ - #define av_abort() do { fprintf(stderr, "Abort at %s:%d\n", __FILE__, __LINE__); abort(); } while (0) /* assume b>0 */ @@ -888,13 +886,6 @@ return a; } -/* memory */ -void *av_malloc(int size); -void *av_mallocz(int size); -void av_free(void *ptr); -void __av_freep(void **ptr); -#define av_freep(p) __av_freep((void **)(p)) - /* math */ int ff_gcd(int a, int b); @@ -934,4 +925,6 @@ #define CLAMP_TO_8BIT(d) ((d > 0xff) ? 0xff : (d < 0) ? 0 : d) -#endif +#endif /* HAVE_AV_CONFIG_H */ + +#endif /* COMMON_H */