Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5: typo spotted by Lajos Veres
php · Feb 27, 2014 · bfbdc03 · bfbdc03
2 parents 7031543 + 561843c
commit bfbdc03
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/Zend/zend_vm_gen.php b/Zend/zend_vm_gen.php
@@ -1264,7 +1264,7 @@ function gen_vm($def, $skel) {
 		out($f, "# pragma warning(once : 6285)\n");
 		// Suppress (<non-zero constant> || <expression>) warnings on windows
 		out($f, "# pragma warning(once : 6286)\n");
-		// Suppress constant with constant comparsion warnings on windows
+		// Suppress constant with constant comparison warnings on windows
 		out($f, "# pragma warning(once : 6326)\n");
 	}
 	out($f, "#endif\n");