pajoye          Wed Jul 30 08:38:37 2008 UTC

  Modified files:              (Branch: PHP_5_3)
    /php-src/ext/mbstring/oniguruma     regint.h 
  Log:
  - fix VC9 build (5.3+)
    Please do not revert this fix again and to merge 5.3's changes to HEAD
  
http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/oniguruma/regint.h?r1=1.5.4.5.2.3&r2=1.5.4.5.2.4&diff_format=u
Index: php-src/ext/mbstring/oniguruma/regint.h
diff -u php-src/ext/mbstring/oniguruma/regint.h:1.5.4.5.2.3 
php-src/ext/mbstring/oniguruma/regint.h:1.5.4.5.2.4
--- php-src/ext/mbstring/oniguruma/regint.h:1.5.4.5.2.3 Sun Jul 13 01:25:22 2008
+++ php-src/ext/mbstring/oniguruma/regint.h     Wed Jul 30 08:38:37 2008
@@ -124,9 +124,11 @@
 #define xmemmove    memmove
 #if defined(_WIN32) && !defined(__GNUC__)
 #define xalloca     _alloca
+#if _MSC_VER < 1500
 #ifndef vsnprintf
 #define vsnprintf   _vsnprintf
 #endif
+#endif
 #else
 #define xalloca     alloca
 #endif



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

Reply via email to