summaryrefslogtreecommitdiff
path: root/ext/standard/proc_open.c
diff options
context:
space:
mode:
authorXinchen Hui <laruence@php.net>2012-05-30 14:43:55 +0800
committerXinchen Hui <laruence@php.net>2012-05-30 14:43:55 +0800
commit7511f972fdc395c4770896576bb8752370e46c21 (patch)
tree3f36fc6003513497615d83cf68f85a6c29d65609 /ext/standard/proc_open.c
parent692b3bcd88ece3eefbc5131ecdf971ff18f191cf (diff)
parenta331f43f8cc8f2b9c23ddee95632b765e2e440e5 (diff)
downloadphp-git-7511f972fdc395c4770896576bb8752370e46c21.tar.gz
Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3: Typofix in comment in proc_open.c
Diffstat (limited to 'ext/standard/proc_open.c')
-rw-r--r--ext/standard/proc_open.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/standard/proc_open.c b/ext/standard/proc_open.c
index 4dd52ed28b..5ff91994a7 100644
--- a/ext/standard/proc_open.c
+++ b/ext/standard/proc_open.c
@@ -56,7 +56,7 @@
/* This symbol is defined in ext/standard/config.m4.
* Essentially, it is set if you HAVE_FORK || PHP_WIN32
- * Otherplatforms may modify that configure check and add suitable #ifdefs
+ * Other platforms may modify that configure check and add suitable #ifdefs
* around the alternate code.
* */
#ifdef PHP_CAN_SUPPORT_PROC_OPEN