зеркало из https://github.com/mozilla/gecko-dev.git
Bug 793393: Fix VC8/9 builds: fix HAVE_64BIT_OS test, modify libsrtp to force StandardInteger.h r=khuey
This commit is contained in:
Родитель
73e70d58db
Коммит
947e52bb6f
|
@ -68,19 +68,15 @@ LOCAL_INCLUDES = \
|
||||||
DEFINES += \
|
DEFINES += \
|
||||||
-DHAVE_STDLIB_H=1 \
|
-DHAVE_STDLIB_H=1 \
|
||||||
-DHAVE_STRING_H=1 \
|
-DHAVE_STRING_H=1 \
|
||||||
|
-DINTEGER_TYPES_H="\"mozilla/StandardInteger.h\"" \
|
||||||
|
-DHAVE_UINT8_T=1 \
|
||||||
|
-DHAVE_UINT16_T=1 \
|
||||||
|
-DHAVE_UINT32_T=1 \
|
||||||
|
-DHAVE_UINT64_T=1 \
|
||||||
$(NULL)
|
$(NULL)
|
||||||
|
|
||||||
ifeq ($(HAVE_64BIT_OS),0)
|
# We know StandardInteger.h will define uint8/16/32/64_t, so we don't need
|
||||||
DEFINES += \
|
# to define SIZEOF_UNSIGNED_LONG/SIZEOF_UNSIGNED_LONG_LONG
|
||||||
-DSIZEOF_UNSIGNED_LONG=4 \
|
|
||||||
-DSIZEOF_UNSIGNED_LONG_LONG=8 \
|
|
||||||
$(NULL)
|
|
||||||
else
|
|
||||||
DEFINES += \
|
|
||||||
-DSIZEOF_UNSIGNED_LONG=8 \
|
|
||||||
-DSIZEOF_UNSIGNED_LONG_LONG=8 \
|
|
||||||
$(NULL)
|
|
||||||
endif
|
|
||||||
|
|
||||||
ifeq ($(CPU_ARCH),arm)
|
ifeq ($(CPU_ARCH),arm)
|
||||||
DEFINES += -DCPU_RISC=1
|
DEFINES += -DCPU_RISC=1
|
||||||
|
|
|
@ -59,9 +59,18 @@
|
||||||
#ifdef HAVE_STDLIB_H
|
#ifdef HAVE_STDLIB_H
|
||||||
# include <stdlib.h>
|
# include <stdlib.h>
|
||||||
#endif
|
#endif
|
||||||
|
#ifdef INTEGER_TYPES_H
|
||||||
|
/* Let configure tell us where to get the equivalent to <stdint.h> */
|
||||||
|
#include INTEGER_TYPES_H
|
||||||
|
|
||||||
|
#if !defined(HAVE_UINT64_T)
|
||||||
|
#define NO_64BIT_MATH 1
|
||||||
|
#endif
|
||||||
|
#else
|
||||||
#ifdef HAVE_STDINT_H
|
#ifdef HAVE_STDINT_H
|
||||||
# include <stdint.h>
|
# include <stdint.h>
|
||||||
#endif
|
#endif
|
||||||
|
#endif /* INTEGER_TYPES_H */
|
||||||
#ifdef HAVE_INTTYPES_H
|
#ifdef HAVE_INTTYPES_H
|
||||||
# include <inttypes.h>
|
# include <inttypes.h>
|
||||||
#endif
|
#endif
|
||||||
|
@ -76,7 +85,7 @@
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/* Can we do 64 bit integers? */
|
/* Can we do 64 bit integers? */
|
||||||
#if !defined(HAVE_UINT64_T) || defined(FORCE_UINT64_T)
|
#if !defined(HAVE_UINT64_T)
|
||||||
# if SIZEOF_UNSIGNED_LONG == 8
|
# if SIZEOF_UNSIGNED_LONG == 8
|
||||||
typedef unsigned long uint64_t;
|
typedef unsigned long uint64_t;
|
||||||
# elif SIZEOF_UNSIGNED_LONG_LONG == 8
|
# elif SIZEOF_UNSIGNED_LONG_LONG == 8
|
||||||
|
@ -98,7 +107,6 @@ typedef unsigned short int uint16_t;
|
||||||
typedef unsigned int uint32_t;
|
typedef unsigned int uint32_t;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
||||||
#ifdef NO_64BIT_MATH
|
#ifdef NO_64BIT_MATH
|
||||||
typedef double uint64_t;
|
typedef double uint64_t;
|
||||||
/* assert that sizeof(double) == 8 */
|
/* assert that sizeof(double) == 8 */
|
||||||
|
|
Загрузка…
Ссылка в новой задаче