Bug 716544 - Avoid unexpectedly including toolkit/crashreporter/google-breakpad/src/common/memory.h. r=ted
authorMike Hommey <mh+mozilla@glandium.org>
Tue, 13 Mar 2012 09:47:02 +0100
changeset 92686 012028b5efd928bd2f642fa8c22e1b447fddc5bc
parent 92685 27afd563db7b59bc0c7b8ea0c93820e1c0d0752f
child 92687 cbc1ba56dbde9275fbba50bac5f97f25186743d4
push id886
push userlsblakk@mozilla.com
push dateMon, 04 Jun 2012 19:57:52 +0000
treeherdermozilla-beta@bbd8d5efd6d1 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersted
bugs716544
milestone14.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
Bug 716544 - Avoid unexpectedly including toolkit/crashreporter/google-breakpad/src/common/memory.h. r=ted
toolkit/crashreporter/google-breakpad/src/common/Makefile.in
--- a/toolkit/crashreporter/google-breakpad/src/common/Makefile.in
+++ b/toolkit/crashreporter/google-breakpad/src/common/Makefile.in
@@ -87,8 +87,13 @@ HOST_CXXFLAGS += -DHAVE_MACH_O_NLIST_H
 endif
 
 HOST_CSRCS = $(CSRCS)
 
 # need static lib
 FORCE_STATIC_LIB = 1
 
 include $(topsrcdir)/config/rules.mk
+
+# Headers from this directory are included as "common/header.h". Having
+# -I$(srcdir) on the command line makes us use common/memory.h when
+# <memory.h> is included from system headers, which is not intended.
+INCLUDES = $(LOCAL_INCLUDES) -I$(DIST)/include