diff options
| author | John Koleszar <jkoleszar@google.com> | 2011-07-20 00:05:09 -0400 |
|---|---|---|
| committer | John Koleszar <jkoleszar@google.com> | 2011-07-20 00:05:09 -0400 |
| commit | 8e464cc4c2d02e5daa68a45830f053c8a236ab6f (patch) | |
| tree | 9b4a9e62a028aa4abde82b96b2b8eeb2135a350e /vpx | |
| parent | bf53e74b7f23cd9e55aaf820d7914b0890a16177 (diff) | |
| parent | b2d9700f5313770957878fa36f9971c367f479df (diff) | |
| download | libvpx-8e464cc4c2d02e5daa68a45830f053c8a236ab6f.tar libvpx-8e464cc4c2d02e5daa68a45830f053c8a236ab6f.tar.gz libvpx-8e464cc4c2d02e5daa68a45830f053c8a236ab6f.tar.bz2 libvpx-8e464cc4c2d02e5daa68a45830f053c8a236ab6f.zip | |
Merge remote branch 'internal/upstream' into HEAD
Diffstat (limited to 'vpx')
| -rw-r--r-- | vpx/internal/vpx_codec_internal.h | 18 |
1 files changed, 0 insertions, 18 deletions
diff --git a/vpx/internal/vpx_codec_internal.h b/vpx/internal/vpx_codec_internal.h index 7cc2c3a62..a1ff1921e 100644 --- a/vpx/internal/vpx_codec_internal.h +++ b/vpx/internal/vpx_codec_internal.h @@ -45,7 +45,6 @@ #define VPX_CODEC_INTERNAL_H #include "../vpx_decoder.h" #include "../vpx_encoder.h" -#include "vpx_config.h" #include <stdarg.h> @@ -436,23 +435,6 @@ vpx_codec_pkt_list_get(struct vpx_codec_pkt_list *list, #include <stdio.h> #include <setjmp.h> - -/* GLIBC started intercepting calls to longjmp in version 2.11, if the - * FORTIFY_SOURCE flag is defined (it's defined by default on Ubuntu). - * This can cause problems running under older versions of GLIBC (ie, - * for binary distributions), so work around it by linking to the - * underlying longjmp call directly. - */ -#if defined(__GNUC_PREREQ) -#if __GNUC_PREREQ (2,11) -#if ARCH_X86_64 -__asm__(".symver __longjmp_chk,longjmp@GLIBC_2.2.5"); -#else -__asm__(".symver __longjmp_chk,longjmp@GLIBC_2.0"); -#endif -#endif -#endif - struct vpx_internal_error_info { vpx_codec_err_t error_code; |