diff options
| author | Joe Watkins <krakjoe@php.net> | 2017-07-24 10:42:35 +0100 |
|---|---|---|
| committer | Joe Watkins <krakjoe@php.net> | 2017-07-24 10:42:35 +0100 |
| commit | 642fb44d6914960e415c74c6e712986fb604fa9d (patch) | |
| tree | 969718f1ae07046a22a8864b46d38447f9f6e1cc | |
| parent | f116a885921a008d9b94a7c1089aa85ae82461c3 (diff) | |
| parent | c4e11c8ef379346e15f2dfc9e0d664e0cf8b088e (diff) | |
| download | php-git-642fb44d6914960e415c74c6e712986fb604fa9d.tar.gz | |
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Update PHP 5 version to 7 in header comments
| -rw-r--r-- | ext/oci8/oci8_failover.c | 4 | ||||
| -rw-r--r-- | ext/shmop/shmop.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/ext/oci8/oci8_failover.c b/ext/oci8/oci8_failover.c index ab3ba4bd09..4711c39f9d 100644 --- a/ext/oci8/oci8_failover.c +++ b/ext/oci8/oci8_failover.c @@ -1,6 +1,6 @@ /* +----------------------------------------------------------------------+ - | PHP Version 5 | + | PHP Version 7 | +----------------------------------------------------------------------+ | Copyright (c) 1997-2016 The PHP Group | +----------------------------------------------------------------------+ @@ -40,7 +40,7 @@ #include "php_oci8.h" #include "php_oci8_int.h" -/* {{{ callback_fn() +/* {{{ callback_fn() OCI TAF callback function, calling userspace function */ sb4 callback_fn(OCISvcCtx *svchp, OCIEnv *envhp, php_oci_connection *fo_ctx, ub4 fo_type, ub4 fo_event) { diff --git a/ext/shmop/shmop.c b/ext/shmop/shmop.c index 14b14cfb63..0d8984e6cc 100644 --- a/ext/shmop/shmop.c +++ b/ext/shmop/shmop.c @@ -1,6 +1,6 @@ /* +----------------------------------------------------------------------+ - | PHP version 5 | + | PHP version 7 | +----------------------------------------------------------------------+ | Copyright (c) 1997-2017 The PHP Group | +----------------------------------------------------------------------+ |