com php-src: This macro is defined in zend_virtual_cwd.h , avoid redef: main/win95nt.h

From: Date: Mon, 22 Jun 2015 12:02:04 +0000
Subject: com php-src: This macro is defined in zend_virtual_cwd.h , avoid redef: main/win95nt.h
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-87441@lists.php.net to get a copy of this message
Commit: 4807b164fd801381ded0f13c3643f56ef427cda9 Author: Kalle Sommer Nielsen <kalle@php.net> Mon, 22 Jun 2015 14:02:04 +0200 Parents: 093546308e2528604b7fe2eae5d39f96d0e2d8b0 Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=4807b164fd801381ded0f13c3643f56ef427cda9 Log: This macro is defined in zend_virtual_cwd.h, avoid redef Changed paths: M main/win95nt.h Diff: diff --git a/main/win95nt.h b/main/win95nt.h index 12356ee..84c3647 100644 --- a/main/win95nt.h +++ b/main/win95nt.h @@ -39,7 +39,9 @@ typedef char * caddr_t; #define _IFLNK 0120000 /* symbolic link */ #define S_IFIFO _IFIFO #define S_IFBLK _IFBLK -#define S_IFLNK _IFLNK +#ifndef S_IFLNK +# define S_IFLNK _IFLNK +#endif #define chdir(path) _chdir(path) #define mkdir(a, b) _mkdir(a) #define rmdir(a) _rmdir(a)

« previous php.cvs (#87441) next »