]> git.kaiwu.me - nginx.git/commitdiff
Configure: fixed type max value detection.
authorRuslan Ermilov <ru@nginx.com>
Tue, 17 Mar 2015 23:04:39 +0000 (02:04 +0300)
committerRuslan Ermilov <ru@nginx.com>
Tue, 17 Mar 2015 23:04:39 +0000 (02:04 +0300)
The code tried to use suffixes for "long" and "long long" types, but
it never worked as intended due to the bug in the shell code.  Also,
the max value for any 64-bit type other than "long long" on platforms
with 32-bit "long" would be incorrect if the bug was fixed.

So instead of fixing the bug in the shell code, always use the "int"
constant for 32-bit types, and "long long" constant for 64-bit types.

auto/types/sizeof

index 9215a545fc4c58f8f4948335500ad1e107996e65..a5f66bbd99a2c501844019742ac5aa6bce19e302 100644 (file)
@@ -50,22 +50,12 @@ rm -rf $NGX_AUTOTEST*
 
 case $ngx_size in
     4)
-        if [ "$ngx_type"="long" ]; then
-            ngx_max_value=2147483647L
-        else
-            ngx_max_value=2147483647
-        fi
-
+        ngx_max_value=2147483647
         ngx_max_len='(sizeof("-2147483648") - 1)'
     ;;
 
     8)
-        if [ "$ngx_type"="long long" ]; then
-            ngx_max_value=9223372036854775807LL
-        else
-            ngx_max_value=9223372036854775807L
-        fi
-
+        ngx_max_value=9223372036854775807LL
         ngx_max_len='(sizeof("-9223372036854775808") - 1)'
     ;;