com php-src: rename header: ext/standard/ftok.c win32/ftok.c win32/ftok.h win32/ipc.h
| From: | Anatol Belski | Date: | Sat, 10 Oct 2015 15:31:33 +0000 |
| Subject: | com php-src: rename header: ext/standard/ftok.c win32/ftok.c win32/ftok.h win32/ipc.h | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-89358@lists.php.net to get a copy of this message | ||
Commit: c3dd6058df57447216da5dcf38b0aeb35580292a
Author: Anatol Belski <ab@php.net> Fri, 25 Sep 2015 11:43:34 +0200
Parents: f588c29f9a25c6a10b04edce7ce98432daad327b
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=c3dd6058df57447216da5dcf38b0aeb35580292a
Log:
rename header
Changed paths:
M ext/standard/ftok.c
M win32/ftok.c
D win32/ftok.h
A win32/ipc.h
Diff:
diff --git a/ext/standard/ftok.c b/ext/standard/ftok.c
index dac4e88..334d6d1 100644
--- a/ext/standard/ftok.c
+++ b/ext/standard/ftok.c
@@ -27,7 +27,7 @@
#endif
#ifdef PHP_WIN32
-#include "win32/ftok.h"
+#include "win32/ipc.h"
#endif
#if HAVE_FTOK
diff --git a/win32/ftok.c b/win32/ftok.c
index 322d9e7..9e79c70 100644
--- a/win32/ftok.c
+++ b/win32/ftok.c
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-#include "ftok.h"
+#include "ipc.h"
#include <windows.h>
#include <sys/stat.h>
diff --git a/win32/ftok.h b/win32/ftok.h
deleted file mode 100644
index ccae6e5..0000000
--- a/win32/ftok.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- +----------------------------------------------------------------------+
- | PHP Version 7 |
- +----------------------------------------------------------------------+
- | Copyright (c) 1997-2015 The PHP Group |
- +----------------------------------------------------------------------+
- | This source file is subject to version 3.01 of the PHP license, |
- | that is bundled with this package in the file LICENSE, and is |
- | available through the world-wide-web at the following url: |
- | http://www.php.net/license/3_01.txt
|
- | If you did not receive a copy of the PHP license and are unable to |
- | obtain it through the world-wide-web, please send a note to |
- | license@php.net so we can mail you a copy immediately. |
- +----------------------------------------------------------------------+
- | Author: Anatol Belski <ab@php.net> |
- +----------------------------------------------------------------------+
- */
-
-#ifndef PHP_WIN32_IPC_H
-#define PHP_WIN32_IPC_H 1
-
-typedef int key_t;
-
-key_t ftok(const char *path, int id);
-
-
-#endif /* PHP_WIN32_IPC_H */
diff --git a/win32/ipc.h b/win32/ipc.h
new file mode 100644
index 0000000..ccae6e5
--- /dev/null
+++ b/win32/ipc.h
@@ -0,0 +1,27 @@
+/*
+ +----------------------------------------------------------------------+
+ | PHP Version 7 |
+ +----------------------------------------------------------------------+
+ | Copyright (c) 1997-2015 The PHP Group |
+ +----------------------------------------------------------------------+
+ | This source file is subject to version 3.01 of the PHP license, |
+ | that is bundled with this package in the file LICENSE, and is |
+ | available through the world-wide-web at the following url: |
+ | http://www.php.net/license/3_01.txt
|
+ | If you did not receive a copy of the PHP license and are unable to |
+ | obtain it through the world-wide-web, please send a note to |
+ | license@php.net so we can mail you a copy immediately. |
+ +----------------------------------------------------------------------+
+ | Author: Anatol Belski <ab@php.net> |
+ +----------------------------------------------------------------------+
+ */
+
+#ifndef PHP_WIN32_IPC_H
+#define PHP_WIN32_IPC_H 1
+
+typedef int key_t;
+
+key_t ftok(const char *path, int id);
+
+
+#endif /* PHP_WIN32_IPC_H */