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

This commit is contained in:
roytam1 2023-04-07 08:12:29 +08:00
commit 48247ca160
2 changed files with 28 additions and 1 deletions

View file

@ -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)

View file

@ -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>