From 604c7b1ee62c9b9e83cc4d318ed347507e44c676 Mon Sep 17 00:00:00 2001 From: CismonX Date: Fri, 23 Mar 2018 22:17:09 +0800 Subject: [PATCH] Add .gitattributes. Move source files. --- .gitattributes | 1 + config.m4 | 4 +++- config.w32 | 2 +- collections.c => src/collections.c | 0 collections_fe.c => src/collections_me.c | 4 ++-- collections_methods.c => src/collections_methods.c | 2 +- php_collections.h => src/php_collections.h | 0 php_collections_fe.h => src/php_collections_me.h | 2 +- 8 files changed, 9 insertions(+), 6 deletions(-) create mode 100644 .gitattributes rename collections.c => src/collections.c (100%) rename collections_fe.c => src/collections_me.c (99%) rename collections_methods.c => src/collections_methods.c (99%) rename php_collections.h => src/php_collections.h (100%) rename php_collections_fe.h => src/php_collections_me.h (98%) diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..cd368d1 --- /dev/null +++ b/.gitattributes @@ -0,0 +1 @@ +*.h linguist-language=C \ No newline at end of file diff --git a/config.m4 b/config.m4 index 6dabad8..fe70154 100644 --- a/config.m4 +++ b/config.m4 @@ -10,6 +10,8 @@ if test "$PHP_COLLECTIONS" != "no"; then else CFLAGS="-O2" fi - COLLECTIONS_SRC="collections.c collections_fe.c collections_methods.c" + COLLECTIONS_SRC="src/collections.c + src/collections_me.c + src/collections_methods.c" PHP_NEW_EXTENSION(collections, $COLLECTIONS_SRC, $ext_shared) fi diff --git a/config.w32 b/config.w32 index 466d642..3aae4c6 100644 --- a/config.w32 +++ b/config.w32 @@ -1,5 +1,5 @@ ARG_ENABLE("collections", "enable collections support", "no"); if (PHP_COLLECTIONS != "no") { - EXTENSION("collections", "collections.c collections_fe.c collections_methods.c", true); + EXTENSION("collections", "src/collections.c src/collections_me.c src/collections_methods.c", true); } diff --git a/collections.c b/src/collections.c similarity index 100% rename from collections.c rename to src/collections.c diff --git a/collections_fe.c b/src/collections_me.c similarity index 99% rename from collections_fe.c rename to src/collections_me.c index 566ad31..9e51e56 100644 --- a/collections_fe.c +++ b/src/collections_me.c @@ -1,5 +1,5 @@ // -// ext-collections/collections_fe.c +// ext-collections/collections_me.c // // @Author CismonX // @@ -7,7 +7,7 @@ #include #include "php_collections.h" -#include "php_collections_fe.h" +#include "php_collections_me.h" ZEND_BEGIN_ARG_INFO(action_arginfo, 0) ZEND_ARG_CALLABLE_INFO(0, action, 0) diff --git a/collections_methods.c b/src/collections_methods.c similarity index 99% rename from collections_methods.c rename to src/collections_methods.c index 65c4cfa..2bed811 100644 --- a/collections_methods.c +++ b/src/collections_methods.c @@ -7,7 +7,7 @@ #include #include "php_collections.h" -#include "php_collections_fe.h" +#include "php_collections_me.h" #define NEW_COLLECTION_OBJ(name) \ zend_object* (name) = (zend_object*)ecalloc(1, sizeof(zend_object) + \ diff --git a/php_collections.h b/src/php_collections.h similarity index 100% rename from php_collections.h rename to src/php_collections.h diff --git a/php_collections_fe.h b/src/php_collections_me.h similarity index 98% rename from php_collections_fe.h rename to src/php_collections_me.h index b5e1fa0..d4888a1 100644 --- a/php_collections_fe.h +++ b/src/php_collections_me.h @@ -1,5 +1,5 @@ // -// ext-collections/php_collections_fe.h +// ext-collections/php_collections_me.h // // @Author CismonX //