cvs: php-src(PHP_5_3) /main win95nt.h

pajoye Sat Jul 5 18:51:17 2008 UTC Modified files: (Branch: PHP_5_3) /php-src/main win95nt.h Log: - MFH: don't redefine WINDOWS and pid_t http://cvs.php.net/viewvc.cgi/php-src/main/win95nt.h?r1=1.20.2.2.2.2.2.2&r2=1.20.2.2.2.2.2.3&diff_format=u Index: php-src/main/win95nt.h diff -u php-src/main/win95nt.h:1.20.2.2.2.2.2.2 php-src/main/win95nt.h:1.20.2.2.2.2.2.3 --- php-src/main/win95nt.h:1.20.2.2.2.2.2.2 Sat Jul 5 18:36:34 2008 +++ php-src/main/win95nt.h Sat Jul 5 18:51:17 2008 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: win95nt.h,v 1.20.2.2.2.2.2.2 2008/07/05 18:36:34 pajoye Exp $ */ +/* $Id: win95nt.h,v 1.20.2.2.2.2.2.3 2008/07/05 18:51:17 pajoye Exp $ */ /* Defines and types for Windows 95/NT */ #define HAVE_DECLARED_TIMEZONE @@ -74,7 +74,10 @@ #endif /* General Windows stuff */ -#define WINDOWS 1 +#ifndef WINDOWS +# define WINDOWS 1 +#endif + /* Prevent use of VC5 OpenFile function */ #define NOOPENFILE