summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRasmus Lerdorf <rasmus@php.net>2012-03-01 22:34:23 +0000
committerRasmus Lerdorf <rasmus@php.net>2012-03-01 22:34:23 +0000
commit995a668eab1ce346cfd02b550777ab6d946848c3 (patch)
tree91ef80e63d601421eae31dccb7c7d7aaeabad72c
parent62e1dc1dbec9ff6344fc2365239c7e83eb948e7e (diff)
downloadphp-git-995a668eab1ce346cfd02b550777ab6d946848c3.tar.gz
Merge fix for bug 61193
-rw-r--r--main/php.h10
1 files changed, 3 insertions, 7 deletions
diff --git a/main/php.h b/main/php.h
index 68e36ea651..2a93118ac6 100644
--- a/main/php.h
+++ b/main/php.h
@@ -61,13 +61,9 @@
# define PHPAPI
# endif
-#define THREAD_LS
-#define PHP_DIR_SEPARATOR '/'
-#if defined(__MacOSX__)
-#define PHP_EOL "\r"
-#else
-#define PHP_EOL "\n"
-#endif
+# define THREAD_LS
+# define PHP_DIR_SEPARATOR '/'
+# define PHP_EOL "\n"
#endif
#ifdef NETWARE