andrey          Thu Dec  1 09:12:56 2005 EDT

  Modified files:              (Branch: PHP_5_1)
    /php-src/ext/mysqli mysqli_api.c php_mysqli.h 
  Log:
  fix compile failure on Windows - Microsoft hasn't heard of long long :)
  
  
http://cvs.php.net/diff.php/php-src/ext/mysqli/mysqli_api.c?r1=1.118.2.9&r2=1.118.2.10&ty=u
Index: php-src/ext/mysqli/mysqli_api.c
diff -u php-src/ext/mysqli/mysqli_api.c:1.118.2.9 
php-src/ext/mysqli/mysqli_api.c:1.118.2.10
--- php-src/ext/mysqli/mysqli_api.c:1.118.2.9   Wed Nov 30 11:20:22 2005
+++ php-src/ext/mysqli/mysqli_api.c     Thu Dec  1 09:12:55 2005
@@ -15,7 +15,7 @@
   | Author: Georg Richter <[EMAIL PROTECTED]>                                |
   +----------------------------------------------------------------------+
 
-  $Id: mysqli_api.c,v 1.118.2.9 2005/11/30 16:20:22 andrey Exp $ 
+  $Id: mysqli_api.c,v 1.118.2.10 2005/12/01 14:12:55 andrey Exp $ 
 */
 
 #ifdef HAVE_CONFIG_H
@@ -682,8 +682,8 @@
 #if SIZEOF_LONG==8  
                                                        if (uns && llval > 
9223372036854775807L) {
 #elif SIZEOF_LONG==4
-                                                       if ((uns && llval > 
2147483647LL) || 
-                                                           (!uns && (( 
2147483647LL < (long long) llval) || (-2147483648LL > (long long) llval))))
+                                                       if ((uns && llval > 
L64(2147483647)) || 
+                                                           (!uns && (( 
L64(2147483647) < (my_longlong) llval) || (L64(-2147483648) > (my_longlong) 
llval))))
                                                        {
 #endif
                                                                char tmp[22];
http://cvs.php.net/diff.php/php-src/ext/mysqli/php_mysqli.h?r1=1.54.2.2&r2=1.54.2.3&ty=u
Index: php-src/ext/mysqli/php_mysqli.h
diff -u php-src/ext/mysqli/php_mysqli.h:1.54.2.2 
php-src/ext/mysqli/php_mysqli.h:1.54.2.3
--- php-src/ext/mysqli/php_mysqli.h:1.54.2.2    Tue Oct 18 09:51:50 2005
+++ php-src/ext/mysqli/php_mysqli.h     Thu Dec  1 09:12:56 2005
@@ -15,7 +15,7 @@
   | Author: Georg Richter <[EMAIL PROTECTED]>                                |
   +----------------------------------------------------------------------+
 
-  $Id: php_mysqli.h,v 1.54.2.2 2005/10/18 13:51:50 tony2001 Exp $ 
+  $Id: php_mysqli.h,v 1.54.2.3 2005/12/01 14:12:56 andrey Exp $ 
 */
 
 /* A little hack to prevent build break, when mysql is used together with
@@ -446,6 +446,15 @@
 #define my_estrdup(x) (x) ? estrdup(x) : NULL
 #define my_efree(x) if (x) efree(x)
 
+#ifdef PHP_WIN32
+#define L64(x) x##i64
+typedef __int64 my_longlong;
+#else
+#define L64(x) x##LL
+typedef long long my_longlong;
+#endif
+
+
 ZEND_EXTERN_MODULE_GLOBALS(mysqli)
 
 #endif /* PHP_MYSQLI.H */

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

Reply via email to