mozjs/mozjs17.0.0/js/src/config/milestone.pl

@@ -55,7 +55,7 @@ $MILESTONE_FILE  = "$TOPSRCDIR/config/milestone.txt";
 #
 my $milestone = Moz::Milestone::getOfficialMilestone($MILESTONE_FILE);
 
-if (defined(@TEMPLATE_FILE)) {
+if (@TEMPLATE_FILE) {
   my $TFILE;
 
   foreach $TFILE (@TEMPLATE_FILE) {

src/client/js.c

@@ -14,11 +14,9 @@
 /* Ugly but necessary (this is how gjs shuts up the warnings,
    only gcc 4.6 has a nicer (push/pop) way to do it */
 #pragma GCC diagnostic ignored "-Wstrict-prototypes"
-#pragma GCC diagnostic ignored "-Winvalid-offsetof"
 #pragma GCC diagnostic ignored "-Wbad-function-cast"
 #include <jsdbgapi.h>
 #pragma GCC diagnostic warning "-Wbad-function-cast"
-#pragma GCC diagnostic warning "-Winvalid-offsetof"
 #pragma GCC diagnostic warning "-Wstrict-prototypes"
 
 #include <sqlite.h>