Bug 793465 - Disable the unconditional declaration of HAVE_UINT64_T under !Windows. r=glandium
authorSylvestre Ledru <sylvestre@debian.org>
Tue, 14 Jan 2014 09:39:49 -0500
changeset 163320 518ace66cba39c5b7caea1d4dd12cbb43638ff8a
parent 163319 738d458860ca13110778cbf1553e2cdca68b403d
child 163321 72f18544d8ecd25e0fcaeec1d8dffc1dd923836f
push idunknown
push userunknown
push dateunknown
reviewersglandium
bugs793465
milestone29.0a1
Bug 793465 - Disable the unconditional declaration of HAVE_UINT64_T under !Windows. r=glandium External codes have their own definitions or management. cairo (fail under Windows): Defined in gfx/cairo/cairo/src/cairo-wideint-type-private.h intl: Defined in intl/icu/source/configure.in webrtc: media/webrtc/signaling/signaling.gyp netwerk: netwerk/srtp/src/Makefile.in
configure.in
--- a/configure.in
+++ b/configure.in
@@ -7949,19 +7949,21 @@ AC_SUBST(MOZ_PIXMAN_LIBS)
 if test -n "$COMPILE_ENVIRONMENT"; then
     MOZ_CHECK_HEADERS(stdint.h inttypes.h sys/int_types.h)
 fi
 
 if test "$MOZ_TREE_CAIRO"; then
     MOZ_CAIRO_CFLAGS='-I$(LIBXUL_DIST)/include/cairo'
     AC_DEFINE(MOZ_TREE_CAIRO)
 
-    # For now we assume that we will have a uint64_t available through
-    # one of the above headers or mozstdint.h.
-    AC_DEFINE(HAVE_UINT64_T)
+    if test "$OS_ARCH" = "WINNT"; then
+        # For now we assume that we will have a uint64_t available through
+        # one of the above headers or mozstdint.h.
+        AC_DEFINE(HAVE_UINT64_T)
+    fi
 
     # Define macros for cairo-features.h
     TEE_SURFACE_FEATURE="#define CAIRO_HAS_TEE_SURFACE 1"
     if test "$MOZ_X11"; then
         XLIB_SURFACE_FEATURE="#define CAIRO_HAS_XLIB_SURFACE 1"
         XLIB_XRENDER_SURFACE_FEATURE="#define CAIRO_HAS_XLIB_XRENDER_SURFACE 1"
         PS_SURFACE_FEATURE="#define CAIRO_HAS_PS_SURFACE 1"
         FT_FONT_FEATURE="#define CAIRO_HAS_FT_FONT 1"