Re: [PHP4BETA] CVS update: php4
| From: | Zeev Suraski | Date: | Sat, 29 May 1999 15:07:38 +0000 |
| Subject: | Re: [PHP4BETA] CVS update: php4 | ||
| References: | 1 | Groups: | php.version4 |
| Request: | Send a blank email to php-version4+get-1175@lists.php.net to get a copy of this message | ||
Aha, automated search@replace. Never mind my last letter.
Zeev
On 29 May 1999, sas wrote:
> Date: Saturday May 29, 1999 @ 9:53
> Author: sas
>
> Update of /repository/php4
> In directory php:/tmp/cvs-serv10970
>
> Modified Files:
> cgi_main.c getopt.c main.c
> Added Files:
> php_getopt.h
> Removed Files:
> getopt.h
> Log Message:
> getopt.h conflicted with system include file
>
> Index: php4/cgi_main.c
> diff -u php4/cgi_main.c:1.16 php4/cgi_main.c:1.17
> --- php4/cgi_main.c:1.16 Sat May 22 06:56:36 1999
> +++ php4/cgi_main.c Sat May 29 09:53:59 1999
> @@ -57,7 +57,7 @@
> #endif
>
> #if MSVC5 || !defined(HAVE_GETOPT)
> -#include "getopt.h"
> +#include "php_getopt.h"
> #endif
>
> PHPAPI extern char *php3_ini_path;
> Index: php4/getopt.c
> diff -u php4/getopt.c:1.2 php4/getopt.c:1.3
> --- php4/getopt.c:1.2 Mon Apr 26 10:00:46 1999
> +++ php4/getopt.c Sat May 29 09:53:59 1999
> @@ -6,7 +6,7 @@
> #include <string.h>
> #include <assert.h>
> #include <stdlib.h>
> -#include "getopt.h"
> +#include "php_getopt.h"
> #define OPTERRCOLON (1)
> #define OPTERRNF (2)
> #define OPTERRARG (3)
> Index: php4/main.c
> diff -u php4/main.c:1.66 php4/main.c:1.67
> --- php4/main.c:1.66 Fri May 28 07:09:36 1999
> +++ php4/main.c Sat May 29 09:53:59 1999
> @@ -29,7 +29,7 @@
> +----------------------------------------------------------------------+
> */
>
> -/* $Id: main.c,v 1.66 1999/05/28 11:09:36 zeev Exp $ */
> +/* $Id: main.c,v 1.67 1999/05/29 13:53:59 sas Exp $ */
>
>
> #include <stdio.h>
> @@ -86,7 +86,7 @@
> #include "SAPI.h"
>
> #if MSVC5 || !defined(HAVE_GETOPT)
> -#include "getopt.h"
> +#include "php_getopt.h"
> #endif
>
>
>
> --
> PHP 4 Beta
>
>
--
-----------------------------------------------------
Zeev Suraski <zeev@zend.com>
For a PGP public key, finger bourbon@netvision.net.il
--
PHP 4 Beta