am 0f690d9e: Merge "Fix x86-64 libvpx build."

* commit '0f690d9eda1893e66223138d2b930eb3e0164820':
  Fix x86-64 libvpx build.
This commit is contained in:
Elliott Hughes 2014-06-13 03:17:05 +00:00 committed by Android Git Automerger
commit a335c86974

View File

@ -106,8 +106,8 @@ extern void arc4random_addrandom(unsigned char *, int);
#define RAND_MAX 0x7fffffff
/* Work around x86 libvpx build breakage caused by postproc_x86.c. */
#if defined(__i386__) && defined(rand)
/* Work around x86/x86-64 libvpx build breakage caused by postproc_x86.c. */
#if (defined(__i386__) || defined(__x86_64__)) && defined(rand)
#undef rand
#define __rand lrand48
#endif