From 36dad93e4e791902917a493c746b8fbf4632b0e1 Mon Sep 17 00:00:00 2001 From: dongyado Date: Fri, 13 Nov 2015 10:52:27 +0800 Subject: [PATCH 1/3] remove duplicate uint_t define --- binding/c/ip2region.h | 1 - 1 file changed, 1 deletion(-) diff --git a/binding/c/ip2region.h b/binding/c/ip2region.h index 2b560f6..bf7eac7 100644 --- a/binding/c/ip2region.h +++ b/binding/c/ip2region.h @@ -40,7 +40,6 @@ typedef unsigned short ushort_t; typedef unsigned char uchar_t; typedef unsigned int uint_t; -typedef unsigned int uint_t; typedef unsigned long ulong_t; #define INDEX_BLOCK_LENGTH 12 From 1966fc44ecb694030b368e6e7d82d8320b130c96 Mon Sep 17 00:00:00 2001 From: dongyado Date: Sat, 14 Nov 2015 02:19:05 +0800 Subject: [PATCH 2/3] php ext for github --- .gitmodules | 3 +++ binding/php_ext | 1 + 2 files changed, 4 insertions(+) create mode 160000 binding/php_ext diff --git a/.gitmodules b/.gitmodules index 38b7159..3d2557b 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,6 @@ [submodule "binding/ip2region4php"] path = binding/ip2region4php url = https://git.oschina.net/monsterkiller/ip2region.git +[submodule "binding/php_ext"] + path = binding/php_ext + url = git@github.com:dongyado/ip2region.git diff --git a/binding/php_ext b/binding/php_ext new file mode 160000 index 0000000..d46d396 --- /dev/null +++ b/binding/php_ext @@ -0,0 +1 @@ +Subproject commit d46d396a3c927a1cd259bd64038c58d42b1d678b From 12c0304ae28a8344e427065fc9475c39fda47235 Mon Sep 17 00:00:00 2001 From: dongyado Date: Sat, 14 Nov 2015 02:24:14 +0800 Subject: [PATCH 3/3] remove submodule --- .gitmodules | 3 --- binding/php_ext | 1 - 2 files changed, 4 deletions(-) delete mode 160000 binding/php_ext diff --git a/.gitmodules b/.gitmodules index 3d2557b..38b7159 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,6 +1,3 @@ [submodule "binding/ip2region4php"] path = binding/ip2region4php url = https://git.oschina.net/monsterkiller/ip2region.git -[submodule "binding/php_ext"] - path = binding/php_ext - url = git@github.com:dongyado/ip2region.git diff --git a/binding/php_ext b/binding/php_ext deleted file mode 160000 index d46d396..0000000 --- a/binding/php_ext +++ /dev/null @@ -1 +0,0 @@ -Subproject commit d46d396a3c927a1cd259bd64038c58d42b1d678b