com php-src: enable ftok implementation: ext/standard/ftok.c win32/build/config.w32 win32/build/config.w32.h.in
| From: | Anatol Belski | Date: | Sat, 10 Oct 2015 15:31:19 +0000 |
| Subject: | com php-src: enable ftok implementation: ext/standard/ftok.c win32/build/config.w32 win32/build/config.w32.h.in | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-89356@lists.php.net to get a copy of this message | ||
Commit: 2dc0ce2fcd443bbea3d4b52c2d392e403191f8ba
Author: Anatol Belski <ab@php.net> Tue, 22 Sep 2015 21:26:33 +0200
Parents: 5def56e23f5494d69d6bc09460b8132f4e071139
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=2dc0ce2fcd443bbea3d4b52c2d392e403191f8ba
Log:
enable ftok implementation
Changed paths:
M ext/standard/ftok.c
M win32/build/config.w32
M win32/build/config.w32.h.in
Diff:
diff --git a/ext/standard/ftok.c b/ext/standard/ftok.c
index 40e56f1..dac4e88 100644
--- a/ext/standard/ftok.c
+++ b/ext/standard/ftok.c
@@ -26,6 +26,10 @@
#include <sys/ipc.h>
#endif
+#ifdef PHP_WIN32
+#include "win32/ftok.h"
+#endif
+
#if HAVE_FTOK
/* {{{ proto int ftok(string pathname, string proj)
Convert a pathname and a project identifier to a System V IPC key */
diff --git a/win32/build/config.w32 b/win32/build/config.w32
index b7e5e49..609f5c5 100644
--- a/win32/build/config.w32
+++ b/win32/build/config..w32
@@ -160,7 +160,8 @@ ADD_SOURCES("main/streams", "streams.c cast.c memory.c filter.c
plain_wrapper.c
ADD_FLAG("CFLAGS_BD_MAIN_STREAMS", "/D ZEND_ENABLE_STATIC_TSRMLS_CACHE=1");
ADD_SOURCES("win32", "dllmain.c glob.c readdir.c \
- registry.c select.c sendmail.c time.c winutil.c wsyslog.c globals.c getrusage.c");
+ registry.c select.c sendmail.c time.c winutil.c wsyslog.c globals.c \
+ getrusage.c ftok.c");
ADD_FLAG("CFLAGS_BD_WIN32", "/D ZEND_ENABLE_STATIC_TSRMLS_CACHE=1");
diff --git a/win32/build/config.w32.h.in b/win32/build/config.w32.h.in
index b2ee6f1..d73678b 100644
--- a/win32/build/config.w32.h.in
+++ b/win32/build/config.w32.h.in
@@ -183,3 +183,4 @@
#define HAVE_GETRUSAGE
+#define HAVE_FTOK 1