diff options
| author | wolfbeast <mcwerewolf@gmail.com> | 2018-11-07 06:01:03 +0100 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@gmail.com> | 2018-11-07 06:01:03 +0100 |
| commit | 63635e38ff9341c02fae7f4557d230ec710947b6 (patch) | |
| tree | 007459a8c21a0ed58051b177eb60a2e67aa429c5 /media/libvpx | |
| parent | 1626b5d7041ea9c3db92200f91542da46e49dde6 (diff) | |
| parent | 3c5a34c90075c8cee4be7d316f4b2d7390f7bc29 (diff) | |
| download | UXP-2018.11.07.tar UXP-2018.11.07.tar.gz UXP-2018.11.07.tar.lz UXP-2018.11.07.tar.xz UXP-2018.11.07.zip | |
Merge branch 'master' into Basilisk-releasev2018.11.07
Diffstat (limited to 'media/libvpx')
| -rw-r--r-- | media/libvpx/vpx_config_x86-win32-vs12.h | 3 | ||||
| -rw-r--r-- | media/libvpx/vpx_config_x86_64-win64-vs12.h | 3 |
2 files changed, 6 insertions, 0 deletions
diff --git a/media/libvpx/vpx_config_x86-win32-vs12.h b/media/libvpx/vpx_config_x86-win32-vs12.h index 42525a303..9ec6a90be 100644 --- a/media/libvpx/vpx_config_x86-win32-vs12.h +++ b/media/libvpx/vpx_config_x86-win32-vs12.h @@ -31,6 +31,9 @@ #define HAVE_AVX 1 #define HAVE_AVX2 1 #define HAVE_VPX_PORTS 1 +#ifdef HAVE_STDINT_H +#undef HAVE_STDINT_H +#endif #define HAVE_STDINT_H 0 #define HAVE_PTHREAD_H 0 #define HAVE_SYS_MMAN_H 0 diff --git a/media/libvpx/vpx_config_x86_64-win64-vs12.h b/media/libvpx/vpx_config_x86_64-win64-vs12.h index 65e45f5ba..afbaf2e43 100644 --- a/media/libvpx/vpx_config_x86_64-win64-vs12.h +++ b/media/libvpx/vpx_config_x86_64-win64-vs12.h @@ -31,6 +31,9 @@ #define HAVE_AVX 1 #define HAVE_AVX2 1 #define HAVE_VPX_PORTS 1 +#ifdef HAVE_STDINT_H +#undef HAVE_STDINT_H +#endif #define HAVE_STDINT_H 0 #define HAVE_PTHREAD_H 0 #define HAVE_SYS_MMAN_H 0 |