RE: [PHP-CVS] com php-src: Eliminate win95nt.h: ext/odbc/birdstep.c main/SAPI.h main/php.h main/win95nt.h win32/build/confutils.js

Hi Kalle, > -----Original Message----- > From: Kalle Sommer Nielsen [mailto:kalle@php.net] > Sent: Thursday, December 22, 2016 6:51 AM > To: php-cvs@lists.php.net > Subject: [PHP-CVS] com php-src: Eliminate win95nt.h: ext/odbc/birdstep.c > main/SAPI.h main/php.h main/win95nt.h win32/build/confutils.js > > Commit: d4831e2d0a812486cae8fb30afa5b9e0e03e03ce > Author: Kalle Sommer Nielsen <kalle@php.net> Thu, 22 Dec 2016 06:51:18 > +0100 > Parents: a569d003e268dabf3a681f04e58313a13a51e59a > Branches: master > > Link: http://git.php.net/?p=php- > src.git;a=commitdiff;h=d4831e2d0a812486cae8fb30afa5b9e0e03e03ce > > Log: > Eliminate win95nt.h > > - Most of this is builtin php.h now > - Removed some dead defines > - We now pass /D _USE_MATH_DEFINES for M_PI etc > IMO these defines still need a closer look. Some you've cleaned, but others are just moved from one place to another. Some cleanup are still due. Or, maybe we should think about some better global compatibility layer, would still have time for 7.2. Regards Anatol > Changed paths: > M ext/odbc/birdstep.c > M main/SAPI.h > M main/php.h > D main/win95nt.h > M win32/build/confutils.js > > > Diff: > diff --git a/ext/odbc/birdstep.c b/ext/odbc/birdstep.c index f12545b..15533c4 > 100644 > --- a/ext/odbc/birdstep.c > +++ b/ext/odbc/birdstep.c > @@ -32,7 +32,6 @@ > > #if WIN32 > # include "config.w32.h" > -# include "win95nt.h" > # ifdef PHP_EXPORTS > # define PHPAPI __declspec(dllexport) > # else > diff --git a/main/SAPI.h b/main/SAPI.h > index c10e1cb..ea8bb6d 100644 > --- a/main/SAPI.h > +++ b/main/SAPI.h > @@ -27,7 +27,6 @@ > #include "zend_llist.h" > #include "zend_operators.h" > #ifdef PHP_WIN32 > -#include "win95nt.h" > #include "win32/php_stdint.h" > #endif > #include <sys/stat.h> > diff --git a/main/php.h b/main/php.h > index 4ed2b9d..a8a852f 100644 > --- a/main/php.h > +++ b/main/php.h > @@ -47,7 +47,6 @@ > > #ifdef PHP_WIN32 > # include "tsrm_win32.h" > -# include "win95nt.h" > # ifdef PHP_EXPORTS > # define PHPAPI __declspec(dllexport) > # else > @@ -66,6 +65,53 @@ > # define PHP_EOL "\n" > #endif > > +/* Windows specific defines */ > +#ifdef PHP_WIN32 > +# define PHP_PROG_SENDMAIL "Built in mailer" > +# define HAVE_DECLARED_TIMEZONE > +# define WIN32_LEAN_AND_MEAN > +# define NOOPENFILE > + > +# include <io.h> > +# include <malloc.h> > +# include <direct.h> > +# include <stdlib.h> > +# include <stdio.h> > +# include <stdarg.h> > +# include <sys/types.h> > +# include <process.h> > + > +typedef int uid_t; > +typedef int gid_t; > +typedef char * caddr_t; > +typedef unsigned int uint; > +typedef unsigned long ulong; > +# if !NSAPI > +typedef int pid_t; > +# endif > + > +# ifndef PHP_DEBUG > +# ifdef inline > +# undef inline > +# endif > +# define inline __inline > +# endif > + > +# define M_TWOPI (M_PI * 2.0) > +# define off_t _off_t > + > +# define lstat(x, y) php_sys_lstat(x, y) > +# define chdir(path) _chdir(path) > +# define mkdir(a, b) _mkdir(a) > +# define rmdir(a) _rmdir(a) > +# define getpid _getpid > +# define php_sleep(t) SleepEx(t*1000, TRUE) > + > +# ifndef getcwd > +# define getcwd(a, b) _getcwd(a, b) > +# endif > +#endif > + > #if HAVE_ASSERT_H > #if PHP_DEBUG > #undef NDEBUG > diff --git a/main/win95nt.h b/main/win95nt.h deleted file mode 100644 index > 5a45e24..0000000 > --- a/main/win95nt.h > +++ /dev/null > @@ -1,80 +0,0 @@ > -/* > - +----------------------------------------------------------------------+ > - | PHP Version 7 | > - +----------------------------------------------------------------------+ > - | Copyright (c) 1997-2016 The PHP Group | > - +----------------------------------------------------------------------+ > - | This source file is subject to version 3.01 of the PHP license, | > - | that is bundled with this package in the file LICENSE, and is | > - | available through the world-wide-web at the following url: | > - | http://www.php.net/license/3_01.txt > | > - | If you did not receive a copy of the PHP license and are unable to | > - | obtain it through the world-wide-web, please send a note to | > - | license@php.net so we can mail you a copy immediately. | > - +----------------------------------------------------------------------+ > - | Author: | > - +----------------------------------------------------------------------+ > -*/ > - > -/* $Id$ */ > - > -/* Defines and types for Windows 95/NT */ -#define > HAVE_DECLARED_TIMEZONE -#define WIN32_LEAN_AND_MEAN -#include > <io.h> -#include <malloc.h> -#include <direct.h> -#include <stdlib.h> > -#include > <stdio.h> -#include <stdarg.h> -#include <sys/types.h> -#include > <process.h> > - > -typedef int uid_t; > -typedef int gid_t; > -typedef char * caddr_t; > -#define lstat(x, y) php_sys_lstat(x, y) -#define chdir(path) _chdir(path) > -#define mkdir(a, b) _mkdir(a) > -#define rmdir(a) _rmdir(a) > -#define getpid _getpid > -#define php_sleep(t) SleepEx(t*1000, TRUE) > -#ifndef getcwd > -# define getcwd(a, b) _getcwd(a, b) > -#endif > -#define off_t _off_t > -typedef unsigned int uint; > -typedef unsigned long ulong; > -#if !NSAPI > -typedef int pid_t; > -#endif > - > -/* missing in vc5 math.h */ > -#define M_PI 3.14159265358979323846 > -#define M_TWOPI (M_PI * 2.0) > -#define M_PI_2 1.57079632679489661923 > -#ifndef M_PI_4 > -#define M_PI_4 0.78539816339744830962 > -#endif > - > -#if !defined(PHP_DEBUG) > -#ifdef inline > -#undef inline > -#endif > -#define inline __inline > -#endif > - > -/* General Windows stuff */ > -#ifndef WINDOWS > -# define WINDOWS 1 > -#endif > - > - > -/* Prevent use of VC5 OpenFile function */ -#define NOOPENFILE > - > -/* sendmail is built-in */ > -#ifdef PHP_PROG_SENDMAIL > -#undef PHP_PROG_SENDMAIL > -#define PHP_PROG_SENDMAIL "Built in mailer" > -#endif > diff --git a/win32/build/confutils.js b/win32/build/confutils.js index > 3785011..11915d3 100644 > --- a/win32/build/confutils.js > +++ b/win32/build/confutils.js > @@ -3032,8 +3032,9 @@ function toolset_setup_common_cflags() > DEFINE('CFLAGS_PHP_OBJ', '$(CFLAGS_PHP) $(STATIC_EXT_CFLAGS)'); > > // General CFLAGS for building objects > - DEFINE("CFLAGS", "/nologo $(BASE_INCLUDES) /D _WINDOWS \ > - /D ZEND_WIN32=1 /D PHP_WIN32=1 /D WIN32 /D _MBCS > /W3"); > + DEFINE("CFLAGS", "/nologo $(BASE_INCLUDES) /D _WINDOWS /D > WINDOWS=1 \ > + /D ZEND_WIN32=1 /D PHP_WIN32=1 /D WIN32 /D _MBCS /W3 > \ > + /D _USE_MATH_DEFINES"); > > if (VS_TOOLSET) { > ADD_FLAG("CFLAGS", " /FD "); > > > -- > PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: > http://www.php.net/unsub.php