From: Anatol Belski <ab@php.net>
Date: Tue, 22 Sep 2015 19:26:33 +0000 (+0200)
Subject: enable ftok implementation
X-Git-Tag: php-7.1.0alpha1~990
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2dc0ce2fcd443bbea3d4b52c2d392e403191f8ba;p=php

enable ftok implementation
---

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