Merge branch 'master' into jit-dynasm

dstogov · dstogov · commit baef1a546476 · 2017-09-04T20:13:15.000+03:00
* master:
  Fixed tests
  NEWS
  Fixed Bug #75149 redefinition of typedefs ttinfo and t1info
diff --git a/ext/date/lib/timelib_private.h b/ext/date/lib/timelib_private.h
@@ -115,21 +115,21 @@
 		m = NULL;   \
 	}
 
-typedef struct ttinfo
+struct ttinfo
 {
 	int32_t      offset;
 	int          isdst;
 	unsigned int abbr_idx;
 
 	unsigned int isstdcnt;
 	unsigned int isgmtcnt;
-} ttinfo;
+};
 
-typedef struct tlinfo
+struct tlinfo
 {
 	int32_t  trans;
 	int32_t  offset;
-} tlinfo;
+};
 
 
 #ifndef LONG_MAX
diff --git a/ext/opcache/tests/jmp_elim_001.phpt b/ext/opcache/tests/jmp_elim_001.phpt
@@ -8,11 +8,9 @@ Edge-cases in constant conditional jump elimination
 $webserver = "Apache";
 $cpuArc = "x86_64";
 $archName = (strstr($cpuArc, "64") || PHP_INT_SIZE === 8) ? "64" : "32";
-$info = array('os' => PHP_OS,
-              'phpversion' => phpversion(),
-              'arch' => $archName,
+$info = array('arch' => $archName,
               'webserver' =>$webserver);
 header('Content-Type: application/json');
 echo json_encode($info) . "\n";
 --EXPECT--
-{"os":"Linux","phpversion":"7.2.0-dev","arch":"64","webserver":"Apache"}
+{"arch":"64","webserver":"Apache"}
