diff options
| author | Christopher Jones <sixd@php.net> | 2016-08-07 10:25:16 +1000 |
|---|---|---|
| committer | Christopher Jones <sixd@php.net> | 2016-08-07 10:25:16 +1000 |
| commit | 40bbf4ec06f82ae10616412bc696635a3263cfcd (patch) | |
| tree | ee7fece8b9f5ae4bc6a41b99d84acc86be9c0532 | |
| parent | 9acafa16b1e8f78fe9f7681b36929002d6be9322 (diff) | |
| parent | dd7cdab8e4a0779e714975f52950b277e565ccda (diff) | |
| download | php-git-40bbf4ec06f82ae10616412bc696635a3263cfcd.tar.gz | |
Merge branch 'PHP-7.0' into PHP-7.1
| -rw-r--r-- | ext/oci8/oci8_collection.c | 4 | ||||
| -rw-r--r-- | ext/oci8/oci8_interface.c | 2 | ||||
| -rw-r--r-- | ext/oci8/oci8_lob.c | 4 | ||||
| -rw-r--r-- | ext/oci8/oci8_statement.c | 3 |
4 files changed, 0 insertions, 13 deletions
diff --git a/ext/oci8/oci8_collection.c b/ext/oci8/oci8_collection.c index 21102dc46f..38dedf3260 100644 --- a/ext/oci8/oci8_collection.c +++ b/ext/oci8/oci8_collection.c @@ -25,10 +25,6 @@ +----------------------------------------------------------------------+ */ -/* $Id$ */ - - - #ifdef HAVE_CONFIG_H #include "config.h" #endif diff --git a/ext/oci8/oci8_interface.c b/ext/oci8/oci8_interface.c index bb8828b746..727ec3e1c7 100644 --- a/ext/oci8/oci8_interface.c +++ b/ext/oci8/oci8_interface.c @@ -25,8 +25,6 @@ +----------------------------------------------------------------------+ */ -/* $Id$ */ - #ifdef HAVE_CONFIG_H #include "config.h" #endif diff --git a/ext/oci8/oci8_lob.c b/ext/oci8/oci8_lob.c index 036b14efe8..a0042faec2 100644 --- a/ext/oci8/oci8_lob.c +++ b/ext/oci8/oci8_lob.c @@ -25,10 +25,6 @@ +----------------------------------------------------------------------+ */ -/* $Id$ */ - - - #ifdef HAVE_CONFIG_H #include "config.h" #endif diff --git a/ext/oci8/oci8_statement.c b/ext/oci8/oci8_statement.c index 6f5e559f79..d4f08150e7 100644 --- a/ext/oci8/oci8_statement.c +++ b/ext/oci8/oci8_statement.c @@ -25,9 +25,6 @@ +----------------------------------------------------------------------+ */ -/* $Id$ */ - - #ifdef HAVE_CONFIG_H #include "config.h" #endif |