svn: /php/php-src/branches/PHP_5_4/main/ php.h
| From: | Rasmus Lerdorf | Date: | Thu, 01 Mar 2012 22:34:23 +0000 |
| Subject: | svn: /php/php-src/branches/PHP_5_4/main/ php.h | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-67772@lists.php.net to get a copy of this message | ||
rasmus Thu, 01 Mar 2012 22:34:23 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=323737
Log:
Merge fix for bug 61193
Bug: https://bugs.php.net/61193 (Closed) PHP_EOL definition
for Mac OS X is wrong and unused
Changed paths:
U php/php-src/branches/PHP_5_4/main/php.h
Modified: php/php-src/branches/PHP_5_4/main/php.h
===================================================================
--- php/php-src/branches/PHP_5_4/main/php.h 2012-03-01 22:13:51 UTC (rev 323736)
+++ php/php-src/branches/PHP_5_4/main/php.h 2012-03-01 22:34:23 UTC (rev 323737)
@@ -61,14 +61,10 @@
# 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 */