Merge branch 'PHP-5.6'

* PHP-5.6: Cleanup $ is not needed for git
mudou · Apr 10, 2014 · c2ce0df · c2ce0df
2 parents 7b3e369 + 4048872
commit c2ce0df
Show file tree

Hide file tree

Showing 19 changed files with 2 additions and 38 deletions.
diff --git a/ext/interbase/config.m4 b/ext/interbase/config.m4
@@ -1,7 +1,3 @@
-dnl
-dnl $Id$
-dnl
-
 PHP_ARG_WITH(interbase,for InterBase support,
 [  --with-interbase[=DIR]    Include InterBase support.  DIR is the InterBase base
                           install directory [/usr/interbase]])

diff --git a/ext/interbase/config.w32 b/ext/interbase/config.w32
@@ -1,4 +1,3 @@
-// $Id$
 // vim:ft=javascript
 
 ARG_WITH("interbase", "InterBase support", "no");

diff --git a/ext/interbase/ibase_blobs.c b/ext/interbase/ibase_blobs.c
@@ -16,8 +16,6 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id$ */
-
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif

diff --git a/ext/interbase/ibase_events.c b/ext/interbase/ibase_events.c
@@ -16,8 +16,6 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id$ */
-
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif

diff --git a/ext/interbase/ibase_query.c b/ext/interbase/ibase_query.c
@@ -16,8 +16,6 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id$ */
-
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif

diff --git a/ext/interbase/ibase_service.c b/ext/interbase/ibase_service.c
@@ -16,8 +16,6 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id$ */
-
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif

diff --git a/ext/interbase/interbase.c b/ext/interbase/interbase.c
@@ -18,8 +18,6 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id$ */
-
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif

diff --git a/ext/interbase/php_ibase_includes.h b/ext/interbase/php_ibase_includes.h
@@ -18,8 +18,6 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id$ */
-
 #ifndef PHP_IBASE_INCLUDES_H
 #define PHP_IBASE_INCLUDES_H
 

diff --git a/ext/interbase/php_ibase_udf.c b/ext/interbase/php_ibase_udf.c
@@ -16,8 +16,6 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id$ */
-
 /**
 * This UDF library adds the ability to call PHP functions from SQL
 * statements. Because of SQL's strong typing, you will have to declare

diff --git a/ext/interbase/php_interbase.h b/ext/interbase/php_interbase.h
@@ -18,8 +18,6 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id$ */
-
 #ifndef PHP_INTERBASE_H
 #define PHP_INTERBASE_H
 

diff --git a/ext/interbase/tests/interbase.inc b/ext/interbase/tests/interbase.inc
@@ -1,4 +1,4 @@
-<?php /* $Id$ */
+<?php
 
 srand((double)microtime()*1000000);
 

diff --git a/ext/interbase/tests/skipif.inc b/ext/interbase/tests/skipif.inc
@@ -1,4 +1,4 @@
-<?php /* $Id$ */
+<?php
 
 if (!extension_loaded("interbase")) print "skip interbase extension not available"; 
 require("interbase.inc");

diff --git a/ext/pdo_firebird/config.m4 b/ext/pdo_firebird/config.m4
@@ -1,7 +1,3 @@
-dnl
-dnl $Id$
-dnl
-
 PHP_ARG_WITH(pdo-firebird,for Firebird support for PDO,
 [  --with-pdo-firebird[=DIR] PDO: Firebird support.  DIR is the Firebird base
                           install directory [/opt/firebird]])

diff --git a/ext/pdo_firebird/config.w32 b/ext/pdo_firebird/config.w32
@@ -1,4 +1,3 @@
-// $Id$
 // vim:ft=javascript
 
 ARG_WITH("pdo-firebird", "Firebird support for PDO", "no");

diff --git a/ext/pdo_firebird/firebird_driver.c b/ext/pdo_firebird/firebird_driver.c
@@ -16,8 +16,6 @@
   +----------------------------------------------------------------------+
 */
 
-/* $Id$ */
-
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif

diff --git a/ext/pdo_firebird/firebird_statement.c b/ext/pdo_firebird/firebird_statement.c
@@ -16,8 +16,6 @@
   +----------------------------------------------------------------------+
 */
 
-/* $Id$ */
-
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif

diff --git a/ext/pdo_firebird/pdo_firebird.c b/ext/pdo_firebird/pdo_firebird.c
@@ -16,8 +16,6 @@
   +----------------------------------------------------------------------+
 */
 
-/* $Id$ */
-
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif

diff --git a/ext/pdo_firebird/php_pdo_firebird.h b/ext/pdo_firebird/php_pdo_firebird.h
@@ -16,8 +16,6 @@
   +----------------------------------------------------------------------+
 */
 
-/* $Id$ */
-
 #ifndef PHP_PDO_FIREBIRD_H
 #define PHP_PDO_FIREBIRD_H
 

diff --git a/ext/pdo_firebird/php_pdo_firebird_int.h b/ext/pdo_firebird/php_pdo_firebird_int.h
@@ -16,8 +16,6 @@
   +----------------------------------------------------------------------+
 */
 
-/* $Id$ */
-
 #ifndef PHP_PDO_FIREBIRD_INT_H
 #define PHP_PDO_FIREBIRD_INT_H
-Original file line number
+Diff line change
@@ Expand Up / @@ -16,8 +16,6 @@ @@
        +----------------------------------------------------------------------+
      */
-    /* $Id$ */
     #ifdef HAVE_CONFIG_H
     #include "config.h"
     #endif
@@ Expand Down @@