summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStanislav Malyshev <stas@php.net>2012-06-11 03:38:58 (GMT)
committerStanislav Malyshev <stas@php.net>2012-06-11 03:38:58 (GMT)
commit2065bab102d2117340d5b604f0ac55941c78ced8 (patch)
tree1028ffd10bc560120f81ca671e7dc9328f2a5863
parent552d80bce13840ebf3d1930d2f7011d2a05b2244 (diff)
parentb55e69285bdfa280b94673e8a9434be6c08c65dc (diff)
downloadphp-2065bab102d2117340d5b604f0ac55941c78ced8.tar.gz
Merge branch 'PHP-5.4'
* PHP-5.4: typo fix
-rw-r--r--main/main.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/main/main.c b/main/main.c
index feb1e9f..cc04b13 100644
--- a/main/main.c
+++ b/main/main.c
@@ -1080,7 +1080,7 @@ static void php_error_cb(int type, const char *error_filename, const uint error_
PG(display_errors) == PHP_DISPLAY_ERRORS_STDERR
) {
#ifdef PHP_WIN32
- fprintf(stderr, "%s: %s in %s on line%d\n", error_type_str, buffer, error_filename, error_lineno);
+ fprintf(stderr, "%s: %s in %s on line %d\n", error_type_str, buffer, error_filename, error_lineno);
fflush(stderr);
#else
fprintf(stderr, "%s: %s in %s on line %d\n", error_type_str, buffer, error_filename, error_lineno);