Bug 763573: Don't export PrimitiveConversions.h. r=bz
authorKyle Huey <khuey@kylehuey.com>
Mon, 11 Jun 2012 13:04:34 -0700
changeset 96340 310545e41791488589569c44111c0b5aa4217a76
parent 96339 b76ec573a6f0ee0fd4d2aebdad58be10c1cd5958
child 96341 44777d90bbd604725c19b0e3284ec16bdf0b70b9
push id22897
push userkhuey@mozilla.com
push dateMon, 11 Jun 2012 20:04:49 +0000
treeherdermozilla-central@310545e41791 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbz
bugs763573
milestone16.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 763573: Don't export PrimitiveConversions.h. r=bz
dom/bindings/Codegen.py
dom/bindings/Makefile.in
dom/bindings/PrimitiveConversions.h
dom/bindings/test/Makefile.in
--- a/dom/bindings/Codegen.py
+++ b/dom/bindings/Codegen.py
@@ -3456,17 +3456,17 @@ class CGBindingRoot(CGThing):
                        traitsClasses, curr],
                       "\n")
 
         # Add header includes.
         curr = CGHeaders(descriptors,
                          ['mozilla/dom/BindingUtils.h',
                           'mozilla/dom/DOMJSClass.h'],
                          ['mozilla/dom/Nullable.h',
-                          'mozilla/dom/PrimitiveConversions.h',
+                          'PrimitiveConversions.h',
                           'XPCQuickStubs.h',
                           'nsDOMQS.h',
                           'AccessCheck.h',
                           'WorkerPrivate.h',
                           'nsContentUtils.h',
                           'mozilla/Preferences.h',
                           # Have to include nsDOMQS.h to get fast arg unwrapping
                           # for old-binding things with castability.
--- a/dom/bindings/Makefile.in
+++ b/dom/bindings/Makefile.in
@@ -59,17 +59,16 @@ EXPORTS_mozilla = \
   ErrorResult.h \
   $(NULL)
 
 EXPORTS_$(binding_include_path) = \
   DOMJSClass.h \
   PrototypeList.h \
   RegisterBindings.h \
   Nullable.h \
-  PrimitiveConversions.h \
   TypedArray.h \
   BindingUtils.h \
   $(exported_binding_headers) \
   $(NULL)
 
 LOCAL_INCLUDES += -I$(topsrcdir)/js/xpconnect/src \
   -I$(topsrcdir)/js/xpconnect/wrappers \
   -I$(topsrcdir)/content/html/content/src
--- a/dom/bindings/PrimitiveConversions.h
+++ b/dom/bindings/PrimitiveConversions.h
@@ -6,16 +6,18 @@
 
 /**
  * Conversions from jsval to primitive values
  */
 
 #ifndef mozilla_dom_PrimitiveConversions_h
 #define mozilla_dom_PrimitiveConversions_h
 
+#include "xpcpublic.h"
+
 namespace mozilla {
 namespace dom {
 
 template<typename T>
 struct PrimitiveConversionTraits {
 };
 
 struct PrimitiveConversionTraits_smallInt {
--- a/dom/bindings/test/Makefile.in
+++ b/dom/bindings/test/Makefile.in
@@ -26,16 +26,17 @@ include $(topsrcdir)/dom/webidl/WebIDL.m
 # But the webidl actually lives in our parent dir
 test_webidl_files := $(addprefix ../,$(test_webidl_files))
 
 CPPSRCS := $(subst .webidl,Binding.cpp,$(test_webidl_files))
 
 LOCAL_INCLUDES += \
   -I$(topsrcdir)/js/xpconnect/src \
   -I$(topsrcdir)/js/xpconnect/wrappers \
+  -I$(topsrcdir)/dom/bindings \
   $(NULL)
 
 include $(topsrcdir)/config/rules.mk
 
 # If you change bindinggen_dependencies here, change it in
 # dom/bindings/Makefile.in too.  But note that we include ../Makefile
 # here manually, since $(GLOBAL_DEPS) won't cover it.
 bindinggen_dependencies := \