kalle                                    Mon, 04 Oct 2010 20:26:50 +0000

Revision: http://svn.php.net/viewvc?view=revision&revision=304036

Log:
Revert for now

Changed paths:
    U   php/php-src/trunk/NEWS
    U   php/php-src/trunk/UPGRADING
    U   php/php-src/trunk/ext/standard/basic_functions.c

Modified: php/php-src/trunk/NEWS
===================================================================
--- php/php-src/trunk/NEWS      2010-10-04 20:20:30 UTC (rev 304035)
+++ php/php-src/trunk/NEWS      2010-10-04 20:26:50 UTC (rev 304036)
@@ -101,9 +101,6 @@
 - Improved the performance of unserialize(). (galaxy dot mipt at gmail dot com,
   Kalle)

-- Added PHP_RAND_MAX & PHP_MT_RAND_MAX constants to get the maximum random
-  range instead of their counterpart functions. (Kalle)
-
 - Removed legacy features:
   . allow_call_time_pass_reference. (Pierrick)
   . define_syslog_variables ini option and its associated function. (Kalle)
@@ -122,7 +119,6 @@
   PDO_mysql. (Johannes)

 - Deprecated mysql_list_dbs() (Request #50667). (Andrey)
-- Deprecated getrandmax() & mt_getrandmax() in favour of constants. (Kalle)

 - Implemented FR #52555 (Ability to get HTTP response code). (Paul Dragoonis)
 - Implemented FR #51295 (SQLite3::busyTimeout not existing). (Mark)

Modified: php/php-src/trunk/UPGRADING
===================================================================
--- php/php-src/trunk/UPGRADING 2010-10-04 20:20:30 UTC (rev 304035)
+++ php/php-src/trunk/UPGRADING 2010-10-04 20:26:50 UTC (rev 304036)
@@ -8,7 +8,6 @@
 4. Changes made to existing methods
 5. Changes made to existing classes
 6. Deprecated
-     a. deprecated functions
 7. Extensions:
      a. moved out to PECL and actively maintained there
      b. no longer maintained
@@ -110,11 +109,6 @@
 6. Deprecated
 =============

-    a. deprecated functions
-
-       - getrandmax()          -- use the PHP_RAND_MAX constant
-       - mt_getrandmax()       -- use the PHP_MT_RAND_MAX constant
-
 ==========
 7. Removed
 ==========
@@ -241,8 +235,6 @@

        - JSON_PRETTY_PRINT
        - JSON_UNESCAPED_SLASHES
-       - PHP_RAND_MAX
-       - PHP_MT_RAND_MAX

      g. New classes


Modified: php/php-src/trunk/ext/standard/basic_functions.c
===================================================================
--- php/php-src/trunk/ext/standard/basic_functions.c    2010-10-04 20:20:30 UTC 
(rev 304035)
+++ php/php-src/trunk/ext/standard/basic_functions.c    2010-10-04 20:26:50 UTC 
(rev 304036)
@@ -33,7 +33,6 @@
 #include "ext/session/php_session.h"
 #include "zend_operators.h"
 #include "ext/standard/php_dns.h"
-#include "ext/standard/php_rand.h"
 #include "ext/standard/php_uuencode.h"

 #ifdef PHP_WIN32
@@ -2829,7 +2828,7 @@

        PHP_FE(rand,                                                            
                                                        arginfo_rand)
        PHP_FE(srand,                                                           
                                                        arginfo_srand)
-       PHP_DEP_FE(getrandmax,                                                  
                                                arginfo_getrandmax)
+       PHP_FE(getrandmax,                                                      
                                                arginfo_getrandmax)
        PHP_FE(mt_rand,                                                         
                                                arginfo_mt_rand)
        PHP_FE(mt_srand,                                                        
                                                        arginfo_mt_srand)
        PHP_DEP_FE(mt_getrandmax,                                               
                                                        arginfo_mt_getrandmax)
@@ -3552,9 +3551,6 @@
        REGISTER_MATH_CONSTANT(M_SQRT3);
        REGISTER_DOUBLE_CONSTANT("INF", php_get_inf(), CONST_CS | 
CONST_PERSISTENT);
        REGISTER_DOUBLE_CONSTANT("NAN", php_get_nan(), CONST_CS | 
CONST_PERSISTENT);
-
-       REGISTER_MATH_CONSTANT(PHP_RAND_MAX);
-       REGISTER_MATH_CONSTANT(PHP_MT_RAND_MAX);

        REGISTER_LONG_CONSTANT("PHP_ROUND_HALF_UP", PHP_ROUND_HALF_UP, CONST_CS 
| CONST_PERSISTENT);
        REGISTER_LONG_CONSTANT("PHP_ROUND_HALF_DOWN", PHP_ROUND_HALF_DOWN, 
CONST_CS | CONST_PERSISTENT);

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

Reply via email to