[PHP-CVS] cvs: php-src(PHP_5_3) /ext/date config.w32 /ext/date/lib parse_iso_intervals.re

[Pierre-Alain Joye]

pajoye          Sat Aug  2 16:50:35 2008 UTC

  Modified files:              (Branch: PHP_5_3)
    /php-src/ext/date   config.w32 
    /php-src/ext/date/lib       parse_iso_intervals.re 
  Log:
  - MFH: improve previous fix for scan, disable optimizer only for scan() using 
#pragma optimize
  
http://cvs.php.net/viewvc.cgi/php-src/ext/date/config.w32?r1=1.5.2.1.4.2&r2=1.5.2.1.4.3&diff_format=u
Index: php-src/ext/date/config.w32
diff -u php-src/ext/date/config.w32:1.5.2.1.4.2 
php-src/ext/date/config.w32:1.5.2.1.4.3
--- php-src/ext/date/config.w32:1.5.2.1.4.2     Sat Aug  2 15:49:37 2008
+++ php-src/ext/date/config.w32 Sat Aug  2 16:50:35 2008
@@ -1,15 +1,10 @@
-// $Id: config.w32,v 1.5.2.1.4.2 2008/08/02 15:49:37 pajoye Exp $
+// $Id: config.w32,v 1.5.2.1.4.3 2008/08/02 16:50:35 pajoye Exp $
 // vim:ft=javascript
 
 EXTENSION("date", "php_date.c", false, "-Iext/date/lib");
 ADD_SOURCES("ext/date/lib", "astro.c timelib.c dow.c parse_date.c parse_tz.c 
tm2unixtime.c unixtime2tm.c parse_iso_intervals.c interval.c", "date");
 AC_DEFINE('HAVE_DATE', 1, 'Have date/time support');
 
-// date parser's scan function too large for VC6 - VC7.x, drop the 
optimization solves the problem
-if (VCVERS<1400) {
- ADD_FLAG('CFLAGS_DATE', ' /O1 ');
-}
-
 var tl_config = FSO.CreateTextFile("ext/date/lib/timelib_config.h", true);
 tl_config.WriteLine("#include \"config.w32.h\"");
 tl_config.Close();
http://cvs.php.net/viewvc.cgi/php-src/ext/date/lib/parse_iso_intervals.re?r1=1.1.2.3&r2=1.1.2.4&diff_format=u
Index: php-src/ext/date/lib/parse_iso_intervals.re
diff -u php-src/ext/date/lib/parse_iso_intervals.re:1.1.2.3 
php-src/ext/date/lib/parse_iso_intervals.re:1.1.2.4
--- php-src/ext/date/lib/parse_iso_intervals.re:1.1.2.3 Sat Aug  2 13:50:52 2008
+++ php-src/ext/date/lib/parse_iso_intervals.re Sat Aug  2 16:50:35 2008
@@ -16,7 +16,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: parse_iso_intervals.re,v 1.1.2.3 2008/08/02 13:50:52 derick Exp $ */
+/* $Id: parse_iso_intervals.re,v 1.1.2.4 2008/08/02 16:50:35 pajoye Exp $ */
 
 #include "timelib.h"
 
@@ -268,6 +268,11 @@
        }                              \
 }
 
+/* date parser's scan function too large for VC6 - VC7.x
+   drop the optimization solves the problem */
+#ifdef PHP_WIN32
+#pragma optimize( "", off )
+#endif
 static int scan(Scanner *s)
 {
        uchar *cursor = s->cur;
@@ -422,6 +427,9 @@
        }
 */
 }
+#ifdef PHP_WIN32
+#pragma optimize( "", on )
+#endif
 
 /*!max:re2c */
 



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php