summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnatol Belski <ab@php.net>2015-09-22 21:26:33 +0200
committerAnatol Belski <ab@php.net>2015-10-10 17:31:19 +0200
commit2dc0ce2fcd443bbea3d4b52c2d392e403191f8ba (patch)
treed00f4bb2e2bc5b6b97be8ac90441144e9ea87fb9
parent5def56e23f5494d69d6bc09460b8132f4e071139 (diff)
downloadphp-git-2dc0ce2fcd443bbea3d4b52c2d392e403191f8ba.tar.gz
enable ftok implementation
-rw-r--r--ext/standard/ftok.c4
-rw-r--r--win32/build/config.w323
-rw-r--r--win32/build/config.w32.h.in1
3 files changed, 7 insertions, 1 deletions
diff --git a/ext/standard/ftok.c b/ext/standard/ftok.c
index 40e56f1851..dac4e8840a 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 b7e5e49220..609f5c5d46 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 b2ee6f1958..d73678b1ec 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