pajoye Sat Jul 5 18:50:10 2008 UTC Modified files: /php-src/main win95nt.h Log: - don't redefine WINDOWS and pid_t http://cvs.php.net/viewvc.cgi/php-src/main/win95nt.h?r1=1.25&r2=1.26&diff_format=u Index: php-src/main/win95nt.h diff -u php-src/main/win95nt.h:1.25 php-src/main/win95nt.h:1.26 --- php-src/main/win95nt.h:1.25 Sat Jul 5 18:36:13 2008 +++ php-src/main/win95nt.h Sat Jul 5 18:50:10 2008 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: win95nt.h,v 1.25 2008/07/05 18:36:13 pajoye Exp $ */ +/* $Id: win95nt.h,v 1.26 2008/07/05 18:50:10 pajoye Exp $ */ /* Defines and types for Windows 95/NT */ #define HAVE_DECLARED_TIMEZONE @@ -52,7 +52,7 @@ #define off_t _off_t typedef unsigned int uint; typedef unsigned long ulong; -#if !NSAPI +#if !NSAPI && !defined(pid_t) typedef long pid_t; #endif @@ -72,7 +72,9 @@ #endif /* General Windows stuff */ -#define WINDOWS 1 +#ifndef WINDOWS +# define WINDOWS 1 +#endif /* Prevent use of VC5 OpenFile function */ #define NOOPENFILE
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php