diff --git a/config/rules.mk b/config/rules.mk index 13a4d430914..ca0d22f761e 100644 --- a/config/rules.mk +++ b/config/rules.mk @@ -2105,6 +2105,7 @@ showbuild: @echo "DLL_SUFFIX = $(DLL_SUFFIX)" @echo "IMPORT_LIB_SUFFIX = $(IMPORT_LIB_SUFFIX)" @echo "INSTALL = $(INSTALL)" + @echo "VPATH = $(VPATH)" showhost: @echo "HOST_CC = $(HOST_CC)" diff --git a/js/src/Makefile.in b/js/src/Makefile.in index 13456c3ad46..fd11b3fa8f3 100644 --- a/js/src/Makefile.in +++ b/js/src/Makefile.in @@ -258,6 +258,19 @@ INSTALLED_HEADERS = \ prmjtime.h \ $(NULL) +############################################### +# BEGIN include sources for low-level code shared with Gecko +# +VPATH += \ + $(srcdir)/../../mfbt \ + $(NULL) + +EXPORTS_NAMESPACES = mozilla + +EXPORTS_mozilla = \ + Util.h \ + $(NULL) + ifdef ENABLE_TRACEJIT VPATH += \ $(srcdir)/tracejit \ diff --git a/js/src/config/rules.mk b/js/src/config/rules.mk index 13a4d430914..ca0d22f761e 100644 --- a/js/src/config/rules.mk +++ b/js/src/config/rules.mk @@ -2105,6 +2105,7 @@ showbuild: @echo "DLL_SUFFIX = $(DLL_SUFFIX)" @echo "IMPORT_LIB_SUFFIX = $(IMPORT_LIB_SUFFIX)" @echo "INSTALL = $(INSTALL)" + @echo "VPATH = $(VPATH)" showhost: @echo "HOST_CC = $(HOST_CC)" diff --git a/mfbt/Util.h b/mfbt/Util.h new file mode 100644 index 00000000000..98098961278 --- /dev/null +++ b/mfbt/Util.h @@ -0,0 +1,47 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- + * vim: set ts=8 sw=4 et tw=99 ft=cpp: + * + * ***** BEGIN LICENSE BLOCK ***** + * Version: MPL 1.1/GPL 2.0/LGPL 2.1 + * + * The contents of this file are subject to the Mozilla Public License Version + * 1.1 (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at: + * http://www.mozilla.org/MPL/ + * + * Software distributed under the License is distributed on an "AS IS" basis, + * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License + * for the specific language governing rights and limitations under the + * License. + * + * The Original Code is Mozilla Code. + * + * The Initial Developer of the Original Code is + * The Mozilla Foundation + * Portions created by the Initial Developer are Copyrigght (C) 2011 + * the Initial Developer. All Rights Reserved. + * + * Contributor(s): + * + * Alternatively, the contents of this file may be used under the terms of + * either the GNU General Public License Version 2 or later (the "GPL"), or + * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), + * in which case the provisions of the GPL or the LGPL are applicable instead + * of those above. If you wish to allow use of your version of this file only + * under the terms of either the GPL or the LGPL, and not to allow others to + * use your version of this file under the terms of the MPL, indicate your + * decision by deleting the provisions above and replace them with the notice + * and other provisions required by the GPL or the LGPL. If you do not delete + * the provisions above, a recipient may use your version of this file under + * the terms of any one of the MPL, the GPL or the LGPL. + * + * ***** END LICENSE BLOCK ***** */ + +#ifndef mozilla_Util_h_ +#define mozilla_Util_h_ + +namespace mozilla { + +} // namespace mozilla + +#endif // mozilla_Util_h_