$NetBSD: patch-ap,v 1.3 2012/11/28 15:50:03 ryoon Exp $ --- libavutil/common.h.orig 2012-06-09 20:09:44.000000000 +0000 +++ libavutil/common.h @@ -37,6 +37,22 @@ #include "attributes.h" #include "libavutil/avconfig.h" +#if defined(__cplusplus) +#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__linux__) +#undef _STDINT_H_ +#undef _SYS_STDINT_H_ +#undef _STDINT_H +#undef _GCC_WRAP_STDINT_H +#ifndef __STDC_CONSTANT_MACROS +#define __STDC_CONSTANT_MACROS +#endif +#include +#endif /* FreeBSD | OpenBSD | linux */ +#if defined(__DragonFly__) || defined(__NetBSD__) +#include +#endif /* DragonFly | NetBSD */ +#endif /* __cplusplus */ + #if AV_HAVE_BIGENDIAN # define AV_NE(be, le) (be) #else