diff options
author | Peter Kokot <peterkokot@gmail.com> | 2018-07-03 02:52:16 +0200 |
---|---|---|
committer | Christoph M. Becker <cmbecker69@gmx.de> | 2018-07-25 00:53:25 +0200 |
commit | 8d3f8ca12a0b00f2a74a27424790222536235502 (patch) | |
tree | f35ddbdb8b5bc9259712d0275cb461ab7de9b7b9 /win32 | |
parent | dcd6a6ff367a91f8c03303a4dc2e3c8b17d692ed (diff) | |
download | php-git-8d3f8ca12a0b00f2a74a27424790222536235502.tar.gz |
Remove unused Git attributes ident
The $Id$ keywords were used in Subversion where they can be substituted
with filename, last revision number change, last changed date, and last
user who changed it.
In Git this functionality is different and can be done with Git attribute
ident. These need to be defined manually for each file in the
.gitattributes file and are afterwards replaced with 40-character
hexadecimal blob object name which is based only on the particular file
contents.
This patch simplifies handling of $Id$ keywords by removing them since
they are not used anymore.
Diffstat (limited to 'win32')
-rw-r--r-- | win32/build/Makefile | 1 | ||||
-rw-r--r-- | win32/build/config.w32 | 1 | ||||
-rw-r--r-- | win32/build/config.w32.h.in | 1 | ||||
-rw-r--r-- | win32/build/configure.tail | 1 | ||||
-rw-r--r-- | win32/build/deplister.c | 2 | ||||
-rw-r--r-- | win32/build/mkdist.php | 2 | ||||
-rw-r--r-- | win32/build/phpize.js.in | 1 | ||||
-rw-r--r-- | win32/build/template.rc | 1 | ||||
-rw-r--r-- | win32/console.c | 2 | ||||
-rw-r--r-- | win32/console.h | 2 | ||||
-rw-r--r-- | win32/fnmatch.c | 1 | ||||
-rw-r--r-- | win32/fnmatch.h | 1 | ||||
-rw-r--r-- | win32/glob.c | 2 | ||||
-rw-r--r-- | win32/glob.h | 1 | ||||
-rw-r--r-- | win32/globals.c | 2 | ||||
-rw-r--r-- | win32/grp.h | 2 | ||||
-rw-r--r-- | win32/php_win32_globals.h | 2 | ||||
-rw-r--r-- | win32/select.c | 2 | ||||
-rw-r--r-- | win32/select.h | 2 | ||||
-rw-r--r-- | win32/sendmail.c | 2 | ||||
-rw-r--r-- | win32/sockets.c | 2 | ||||
-rw-r--r-- | win32/sockets.h | 2 | ||||
-rw-r--r-- | win32/syslog.h | 2 | ||||
-rw-r--r-- | win32/time.c | 2 | ||||
-rw-r--r-- | win32/winutil.c | 2 |
25 files changed, 1 insertions, 40 deletions
diff --git a/win32/build/Makefile b/win32/build/Makefile index 3beaf78eca..b47c3c0aca 100644 --- a/win32/build/Makefile +++ b/win32/build/Makefile @@ -14,7 +14,6 @@ # | Author: Wez Furlong <wez@thebrainroom.com> | # +----------------------------------------------------------------------+ # -# $Id$ # This is the makefile template for the win32 build CC="$(PHP_CL)" diff --git a/win32/build/config.w32 b/win32/build/config.w32 index eb9e6211d8..1075e66048 100644 --- a/win32/build/config.w32 +++ b/win32/build/config.w32 @@ -1,5 +1,4 @@ // vim:ft=javascript -// $Id$ // "Master" config file; think of it as a configure.ac // equivalent. diff --git a/win32/build/config.w32.h.in b/win32/build/config.w32.h.in index ab010f4cb5..8f4078ba79 100644 --- a/win32/build/config.w32.h.in +++ b/win32/build/config.w32.h.in @@ -1,6 +1,5 @@ /* Build Configuration Template for Win32. - $Id$ */ /* Define the minimum supported version */ diff --git a/win32/build/configure.tail b/win32/build/configure.tail index 70625a43d4..c06b03d362 100644 --- a/win32/build/configure.tail +++ b/win32/build/configure.tail @@ -1,5 +1,4 @@ // vim:ft=javascript -// $Id$ // tail end of configure if (!MODE_PHPIZE && sapi_enabled.length < 1) { diff --git a/win32/build/deplister.c b/win32/build/deplister.c index dada082ff4..19966b195e 100644 --- a/win32/build/deplister.c +++ b/win32/build/deplister.c @@ -16,8 +16,6 @@ +----------------------------------------------------------------------+ */ -/* $Id$ */ - /* This little application will list the DLL dependencies for a PE * module to it's stdout for use by distro/installer building tools */ diff --git a/win32/build/mkdist.php b/win32/build/mkdist.php index bf91b8b360..2b44a75ee8 100644 --- a/win32/build/mkdist.php +++ b/win32/build/mkdist.php @@ -1,4 +1,4 @@ -<?php # $Id$ +<?php /* piece together a windows binary distro */ $php_version = $argv[1]; diff --git a/win32/build/phpize.js.in b/win32/build/phpize.js.in index 6a4ef9b4eb..904b1130c1 100644 --- a/win32/build/phpize.js.in +++ b/win32/build/phpize.js.in @@ -16,7 +16,6 @@ +----------------------------------------------------------------------+ */ -/* $Id$ */ // This generates a configure script for win32 build var STDOUT = WScript.StdOut; diff --git a/win32/build/template.rc b/win32/build/template.rc index f871f44c62..ed2b83332a 100644 --- a/win32/build/template.rc +++ b/win32/build/template.rc @@ -1,5 +1,4 @@ /* This is a template RC file. - * $Id$ * Do not edit with MSVC */ #ifdef APSTUDIO_INVOKED # error dont edit with MSVC diff --git a/win32/console.c b/win32/console.c index 3eb7361a74..c7c9f11968 100644 --- a/win32/console.c +++ b/win32/console.c @@ -16,8 +16,6 @@ +----------------------------------------------------------------------+ */ -/* $Id$ */ - #include "win32/console.h" diff --git a/win32/console.h b/win32/console.h index 3ecbc611b9..93fa4ced2b 100644 --- a/win32/console.h +++ b/win32/console.h @@ -16,8 +16,6 @@ +----------------------------------------------------------------------+ */ -/* $Id$ */ - #ifndef PHP_WIN32_CONSOLE_H #define PHP_WIN32_CONSOLE_H diff --git a/win32/fnmatch.c b/win32/fnmatch.c index c3bc5bc5e2..9017b3e19c 100644 --- a/win32/fnmatch.c +++ b/win32/fnmatch.c @@ -34,7 +34,6 @@ * SUCH DAMAGE. * * From FreeBSD fnmatch.c 1.11 - * $Id$ */ #if defined(LIBC_SCCS) && !defined(lint) diff --git a/win32/fnmatch.h b/win32/fnmatch.h index 83f64a0405..c149e89402 100644 --- a/win32/fnmatch.h +++ b/win32/fnmatch.h @@ -33,7 +33,6 @@ * @(#)fnmatch.h 8.1 (Berkeley) 6/2/93 * * From FreeBSD fnmatch.h 1.7 - * $Id$ */ #ifndef _FNMATCH_H_ diff --git a/win32/glob.c b/win32/glob.c index 21a7cc70ef..a0845e803d 100644 --- a/win32/glob.c +++ b/win32/glob.c @@ -34,8 +34,6 @@ * SUCH DAMAGE. */ -/* $Id$ */ - /* * glob(3) -- a superset of the one defined in POSIX 1003.2. * diff --git a/win32/glob.h b/win32/glob.h index 1c10fc6773..946c2ecae8 100644 --- a/win32/glob.h +++ b/win32/glob.h @@ -1,4 +1,3 @@ -/* $Id$ */ /* OpenBSD: glob.h,v 1.7 2002/02/17 19:42:21 millert Exp */ /* NetBSD: glob.h,v 1.5 1994/10/26 00:55:56 cgd Exp */ diff --git a/win32/globals.c b/win32/globals.c index 73246138d6..b872c33c88 100644 --- a/win32/globals.c +++ b/win32/globals.c @@ -16,8 +16,6 @@ +----------------------------------------------------------------------+ */ -/* $Id$ */ - #include "php.h" #include "php_win32_globals.h" #include "syslog.h" diff --git a/win32/grp.h b/win32/grp.h index 6a94b6be68..3da4fa194a 100644 --- a/win32/grp.h +++ b/win32/grp.h @@ -16,8 +16,6 @@ +----------------------------------------------------------------------+ */ -/* $Id$ */ - #ifndef PHP_WIN32_GRP_H #define PHP_WIN32_GRP_H diff --git a/win32/php_win32_globals.h b/win32/php_win32_globals.h index 96993fa853..642acbf9bf 100644 --- a/win32/php_win32_globals.h +++ b/win32/php_win32_globals.h @@ -16,8 +16,6 @@ +----------------------------------------------------------------------+ */ -/* $Id$ */ - #ifndef PHP_WIN32_GLOBALS_H #define PHP_WIN32_GLOBALS_H diff --git a/win32/select.c b/win32/select.c index 9ee24d49b1..04d46ec679 100644 --- a/win32/select.c +++ b/win32/select.c @@ -19,8 +19,6 @@ #include "php.h" #include "php_network.h" -/* $Id$ */ - /* Win32 select() will only work with sockets, so we roll our own implementation here. * - If you supply only sockets, this simply passes through to winsock select(). * - If you supply file handles, there is no way to distinguish between diff --git a/win32/select.h b/win32/select.h index be2a2b9b0f..8e948f7d80 100644 --- a/win32/select.h +++ b/win32/select.h @@ -16,8 +16,6 @@ +----------------------------------------------------------------------+ */ -/* $Id$ */ - #ifndef PHP_WIN32_SELECT_H #define PHP_WIN32_SELECT_H diff --git a/win32/sendmail.c b/win32/sendmail.c index 310f86215a..509dc605c9 100644 --- a/win32/sendmail.c +++ b/win32/sendmail.c @@ -17,8 +17,6 @@ * */ -/* $Id$ */ - #include "php.h" /*php specific */ #include <stdio.h> #include <stdlib.h> diff --git a/win32/sockets.c b/win32/sockets.c index f805661104..588e5d9a05 100644 --- a/win32/sockets.c +++ b/win32/sockets.c @@ -19,8 +19,6 @@ +----------------------------------------------------------------------+ */ -/* $Id$ */ - /* Code originally from ext/sockets */ #include <stdio.h> diff --git a/win32/sockets.h b/win32/sockets.h index b516cc1654..cdd85f3c18 100644 --- a/win32/sockets.h +++ b/win32/sockets.h @@ -19,8 +19,6 @@ +----------------------------------------------------------------------+ */ -/* $Id$ */ - /* Code originally from ext/sockets */ #ifndef PHP_WIN32_SOCKETS_H diff --git a/win32/syslog.h b/win32/syslog.h index 555b598a5b..d6a749d266 100644 --- a/win32/syslog.h +++ b/win32/syslog.h @@ -16,8 +16,6 @@ +----------------------------------------------------------------------+ */ -/* $Id$ */ - #ifndef SYSLOG_H #define SYSLOG_H #define WIN32_LEAN_AND_MEAN diff --git a/win32/time.c b/win32/time.c index f5c8ff5683..cd5a7affdf 100644 --- a/win32/time.c +++ b/win32/time.c @@ -10,8 +10,6 @@ * *****************************************************************************/ -/* $Id$ */ - /* Include stuff ************************************************************ */ #include <config.w32.h> diff --git a/win32/winutil.c b/win32/winutil.c index 4508b3ed34..7faf3bf7bf 100644 --- a/win32/winutil.c +++ b/win32/winutil.c @@ -17,8 +17,6 @@ +----------------------------------------------------------------------+ */ -/* $Id$ */ - #include "php.h" #include "winutil.h" #include <bcrypt.h> |