rasmus Mon, 27 Feb 2012 12:16:39 +0000 Revision: http://svn.php.net/viewvc?view=revision&revision=323577
Log: Fix bug 61193 Bug: https://bugs.php.net/61193 (Open) PHP_EOL definition for Mac OS X is wrong and unused Changed paths: U php/php-src/branches/PHP_5_3/main/php.h U php/php-src/trunk/main/php.h Modified: php/php-src/branches/PHP_5_3/main/php.h =================================================================== --- php/php-src/branches/PHP_5_3/main/php.h 2012-02-27 11:30:03 UTC (rev 323576) +++ php/php-src/branches/PHP_5_3/main/php.h 2012-02-27 12:16:39 UTC (rev 323577) @@ -60,15 +60,10 @@ # else # define PHPAPI # endif - -#define THREAD_LS -#define PHP_DIR_SEPARATOR '/' -#if defined(__MacOSX__) -#define PHP_EOL "\r" -#else -#define PHP_EOL "\n" +# define THREAD_LS +# define PHP_DIR_SEPARATOR '/' +# define PHP_EOL "\n" #endif -#endif #ifdef NETWARE /* For php_get_uname() function */ Modified: php/php-src/trunk/main/php.h =================================================================== --- php/php-src/trunk/main/php.h 2012-02-27 11:30:03 UTC (rev 323576) +++ php/php-src/trunk/main/php.h 2012-02-27 12:16:39 UTC (rev 323577) @@ -60,15 +60,10 @@ # else # define PHPAPI # endif - -#define THREAD_LS -#define PHP_DIR_SEPARATOR '/' -#if defined(__MacOSX__) -#define PHP_EOL "\r" -#else -#define PHP_EOL "\n" +# define THREAD_LS +# define PHP_DIR_SEPARATOR '/' +# define PHP_EOL "\n" #endif -#endif #ifdef NETWARE /* For php_get_uname() function */
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php