media/libvpx/vpx_config.h

Thu, 15 Jan 2015 15:59:08 +0100

author
Michael Schloh von Bennewitz <michael@schloh.com>
date
Thu, 15 Jan 2015 15:59:08 +0100
branch
TOR_BUG_9701
changeset 10
ac0c01689b40
permissions
-rw-r--r--

Implement a real Private Browsing Mode condition by changing the API/ABI;
This solves Tor bug #9701, complying with disk avoidance documented in
https://www.torproject.org/projects/torbrowser/design/#disk-avoidance.

     1 #if defined(VPX_X86_ASM)
     3 #if defined(_WIN64)
     4 /* 64 bit Windows */
     5 #ifdef _MSC_VER
     6 #include "vpx_config_x86_64-win64-vs8.h"
     7 #else
     8 #include "vpx_config_x86_64-win64-gcc.h"
     9 #endif
    11 #elif defined(_WIN32)
    12 /* 32 bit Windows, MSVC. */
    13 #ifdef _MSC_VER
    14 #include "vpx_config_x86-win32-vs8.h"
    15 #else
    16 #include "vpx_config_x86-win32-gcc.h"
    17 #endif
    19 #elif defined(__APPLE__) && defined(__x86_64__)
    20 /* 64 bit MacOS. */
    21 #include "vpx_config_x86_64-darwin9-gcc.h"
    23 #elif defined(__APPLE__) && defined(__i386__)
    24 /* 32 bit MacOS. */
    25 #include "vpx_config_x86-darwin9-gcc.h"
    27 #elif defined(__ELF__) && (defined(__i386) || defined(__i386__))
    28 /* 32 bit ELF platforms. */
    29 #include "vpx_config_x86-linux-gcc.h"
    31 #elif defined(__ELF__) && (defined(__x86_64) || defined(__x86_64__))
    32 /* 64 bit ELF platforms. */
    33 #include "vpx_config_x86_64-linux-gcc.h"
    35 #else
    36 #error VPX_X86_ASM is defined, but assembly not supported on this platform!
    37 #endif
    39 #elif defined(VPX_ARM_ASM)
    41 /* Android */
    42 #include "vpx_config_armv7-android-gcc.h"
    44 #else
    45 /* Assume generic GNU/GCC configuration. */
    46 #include "vpx_config_generic-gnu.h"
    47 #endif
    49 /* Control error-concealment support using our own #define rather than
    50    hard-coding it. */
    51 #if defined(MOZ_VPX_ERROR_CONCEALMENT)
    52 #undef CONFIG_ERROR_CONCEALMENT
    53 #define CONFIG_ERROR_CONCEALMENT 1
    54 #endif

mercurial