[PHP-CVS] cvs: php-src(PHP_5_3) /win32 php_stdint.h

2009-05-04 Thread Pierre-Alain Joye 
pajoye  Mon May  4 21:03:20 2009 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/win32  php_stdint.h 
  Log:
  - revert last commit and fix inline
  
http://cvs.php.net/viewvc.cgi/php-src/win32/php_stdint.h?r1=1.1.2.6&r2=1.1.2.7&diff_format=u
Index: php-src/win32/php_stdint.h
diff -u php-src/win32/php_stdint.h:1.1.2.6 php-src/win32/php_stdint.h:1.1.2.7
--- php-src/win32/php_stdint.h:1.1.2.6  Mon May  4 20:31:02 2009
+++ php-src/win32/php_stdint.h  Mon May  4 21:03:20 2009
@@ -238,7 +238,8 @@
 #define INTMAX_C   INT64_C
 #define UINTMAX_C  UINT64_C
 
-#define llabs(i) (i >= 0? i : -i)
+static __inline int64_t llabs( int64_t i ) { return i >= 0? i: -i; }
+
 #endif // __STDC_CONSTANT_MACROS ]
 
 



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

[PHP-CVS] cvs: php-src(PHP_5_3) /win32 php_stdint.h

2009-05-04 Thread Pierre-Alain Joye 
pajoye  Mon May  4 20:31:02 2009 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/win32  php_stdint.h 
  Log:
  - a  macro will just do it too
  
http://cvs.php.net/viewvc.cgi/php-src/win32/php_stdint.h?r1=1.1.2.5&r2=1.1.2.6&diff_format=u
Index: php-src/win32/php_stdint.h
diff -u php-src/win32/php_stdint.h:1.1.2.5 php-src/win32/php_stdint.h:1.1.2.6
--- php-src/win32/php_stdint.h:1.1.2.5  Mon May  4 17:09:33 2009
+++ php-src/win32/php_stdint.h  Mon May  4 20:31:02 2009
@@ -238,8 +238,7 @@
 #define INTMAX_C   INT64_C
 #define UINTMAX_C  UINT64_C
 
-static inline int64_t llabs( int64_t i ) { return i >= 0? i: -i; }
-
+#define llabs(i) (i >= 0? i : -i)
 #endif // __STDC_CONSTANT_MACROS ]
 
 



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

[PHP-CVS] cvs: php-src(PHP_5_3) /win32 php_stdint.h

2009-05-04 Thread Pierre-Alain Joye 
pajoye  Mon May  4 17:09:33 2009 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/win32  php_stdint.h 
  Log:
  - add llabs
  
http://cvs.php.net/viewvc.cgi/php-src/win32/php_stdint.h?r1=1.1.2.4&r2=1.1.2.5&diff_format=u
Index: php-src/win32/php_stdint.h
diff -u php-src/win32/php_stdint.h:1.1.2.4 php-src/win32/php_stdint.h:1.1.2.5
--- php-src/win32/php_stdint.h:1.1.2.4  Tue Jan 27 21:53:31 2009
+++ php-src/win32/php_stdint.h  Mon May  4 17:09:33 2009
@@ -238,6 +238,8 @@
 #define INTMAX_C   INT64_C
 #define UINTMAX_C  UINT64_C
 
+static inline int64_t llabs( int64_t i ) { return i >= 0? i: -i; }
+
 #endif // __STDC_CONSTANT_MACROS ]
 
 



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

[PHP-CVS] cvs: php-src(PHP_5_3) /win32 php_stdint.h

2009-01-27 Thread Pierre-Alain Joye 
pajoye  Tue Jan 27 21:53:31 2009 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/win32  php_stdint.h 
  Log:
  - prevent redefinition
  
http://cvs.php.net/viewvc.cgi/php-src/win32/php_stdint.h?r1=1.1.2.3&r2=1.1.2.4&diff_format=u
Index: php-src/win32/php_stdint.h
diff -u php-src/win32/php_stdint.h:1.1.2.3 php-src/win32/php_stdint.h:1.1.2.4
--- php-src/win32/php_stdint.h:1.1.2.3  Wed Dec 31 11:15:49 2008
+++ php-src/win32/php_stdint.h  Tue Jan 27 21:53:31 2009
@@ -68,12 +68,22 @@
 // 7.18.1.1 Exact-width integer types
 typedef __int8int8_t;
 typedef __int16   int16_t;
+#ifndef int32_t
 typedef __int32   int32_t;
+#endif
+#ifndef int64_t
 typedef __int64   int64_t;
+#endif
+#ifndef uint8_t
 typedef unsigned __int8   uint8_t;
+#endif
+#ifndef u_char
 typedef unsigned __int8   u_char;
+#endif
 typedef unsigned __int16  uint16_t;
+#ifndef uint32_t
 typedef unsigned __int32  uint32_t;
+#endif
 typedef unsigned __int64  uint64_t;
 
 // 7.18.1.2 Minimum-width integer types



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