| author | Nathan Froyd <froydnj@mozilla.com> |
| Thu, 15 Jan 2015 16:17:55 -0500 | |
| changeset 225154 | c6ece3462afd1a8f3aae1e3ec77d623732e0d3d6 |
| parent 225153 | 70aa258394bfecc49e899bf85ed4730b253de84c |
| child 225155 | b46d45067c8479f3f91e9c8144128fa8a1be5f72 |
| push id | 54467 |
| push user | nfroyd@mozilla.com |
| push date | Thu, 22 Jan 2015 17:43:48 +0000 |
| treeherder | mozilla-inbound@c6ece3462afd [default view] [failures only] |
| reviewers | mshal |
| bugs | 1122235 |
| milestone | 38.0a1 |
| first release with | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
| last release without | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
--- a/gfx/cairo/cairo/src/moz.build +++ b/gfx/cairo/cairo/src/moz.build @@ -194,16 +194,19 @@ DEFINES['PACKAGE_BUGREPORT'] = '"http:// for var in ('CAIRO_HAS_PTHREAD', '_GNU_SOURCE'): DEFINES[var] = True for var in ('MOZ_TREE_CAIRO', 'MOZ_TREE_PIXMAN'): if CONFIG[var]: DEFINES[var] = True +# Normally determined by cairo's configure script. +DEFINES['HAVE_UINT64_T'] = True + if CONFIG['GNU_CC']: DEFINES['HAVE_INTEL_ATOMIC_PRIMITIVES'] = True # We would normally use autoconf to set these up, using AC_CHECK_SIZEOF. # But AC_CHECK_SIZEOF requires running programs to determine the sizes, # and that doesn't work so well with cross-compiling. So instead we # use these magic macros, available since at least GCC 4.3, to define # the preprocessor macros cairo wanted from autoconf. DEFINES['SIZEOF_VOID_P'] = '__SIZEOF_POINTER__'