Merge remote-tracking branch 'origin/tracking' into custom

js/src/frontend/Parser.cpp

@@ -5237,6 +5237,33 @@ Parser<SyntaxParseHandler>::checkExportedName(JSAtom* exportName)
     return false;
 }
 
+// Because all these template methods call each other, let's declare them first before
+// defining them to prevent a GCC compiler error in specialization of member function
+// template after instantiation.
+template<>
+bool
+Parser<FullParseHandler>::checkExportedNamesForDeclaration(ParseNode* node);
+
+template<>
+bool
+Parser<SyntaxParseHandler>::checkExportedNamesForDeclaration(Node node);
+
+template<>
+bool
+Parser<FullParseHandler>::checkExportedNamesForArrayBinding(ListNode* array);
+
+template<>
+inline bool
+Parser<SyntaxParseHandler>::checkExportedNamesForArrayBinding(ListNodeType array);
+
+template<>
+bool
+Parser<FullParseHandler>::checkExportedNamesForObjectBinding(ListNode* obj);
+
+template<>
+inline bool
+Parser<SyntaxParseHandler>::checkExportedNamesForObjectBinding(ListNodeType obj);
+
 template<>
 bool
 Parser<FullParseHandler>::checkExportedNamesForArrayBinding(ListNode* array)

media/mtransport/third_party/nICEr/src/stun/stun.h

@@ -41,7 +41,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include <sys/socket.h>
 #ifndef LINUX
 #include <net/if.h>
-#if !defined(__OpenBSD__) && !defined(__NetBSD__)
+#if !defined(__OpenBSD__) && !defined(__NetBSD__) && !defined(__FreeBSD__)
 #include <net/if_var.h>
 #endif
 #include <net/if_dl.h>