com php-src: closesocket is already defined in main/php_netwo rk.h: sapi/cgi/fastcgi.c
| From: | Xinchen Hui | Date: | Thu, 28 Aug 2014 05:18:55 +0000 |
| Subject: | com php-src: closesocket is already defined in main/php_netwo rk.h: sapi/cgi/fastcgi.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-81242@lists.php.net to get a copy of this message | ||
Commit: 7a90e40af7bed2617a13bcb96a63b53ea90fe29e
Author: Xinchen Hui <laruence@php.net> Thu, 28 Aug 2014 13:18:55 +0800
Parents: 88fdb5f0848aee27b9ac8ff46d7e36fd925100db
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=7a90e40af7bed2617a13bcb96a63b53ea90fe29e
Log:
closesocket is already defined in main/php_network.h
Changed paths:
M sapi/cgi/fastcgi.c
Diff:
diff --git a/sapi/cgi/fastcgi.c b/sapi/cgi/fastcgi.c
index f23b330..ca0e41b 100644
--- a/sapi/cgi/fastcgi.c
+++ b/sapi/cgi/fastcgi.c
@@ -73,7 +73,9 @@
# include <netdb.h>
# include <signal.h>
-# define closesocket(s) close(s)
+# ifndef closesocket
+# define closesocket(s) close(s)
+# endif
# if defined(HAVE_SYS_POLL_H) && defined(HAVE_POLL)
# include <sys/poll.h>