|
 |
7b75198 |
From 4f7c46c98eadc7bae9cc39c942ee626ecae7539e Mon Sep 17 00:00:00 2001
|
|
|
7b75198 |
From: Remi Collet <remi@php.net>
|
|
|
7b75198 |
Date: Fri, 30 Oct 2020 12:51:07 +0000
|
|
|
7b75198 |
Subject: [PATCH] add arginfo and fix build with PHP 8
|
|
|
7b75198 |
|
|
|
7b75198 |
git-svn-id: http://svn.php.net/repository/pecl/geoip/trunk@351082 c90b9560-bf6c-de11-be94-00142212c4b1
|
|
|
7b75198 |
---
|
|
|
7b75198 |
geoip.c | 67 +++++++++++++++++++++++++++++++++++++++++----------------
|
|
|
7b75198 |
1 file changed, 49 insertions(+), 18 deletions(-)
|
|
|
7b75198 |
|
|
|
7b75198 |
diff --git a/geoip.c b/geoip.c
|
|
|
7b75198 |
index ff8ed30..3e41a9d 100644
|
|
|
7b75198 |
--- a/geoip.c
|
|
|
7b75198 |
+++ b/geoip.c
|
|
|
167b2db |
@@ -34,41 +34,72 @@
|
|
|
167b2db |
#include "ext/standard/info.h"
|
|
|
167b2db |
#include "php_geoip.h"
|
|
|
167b2db |
|
|
|
167b2db |
-
|
|
|
167b2db |
+/* For PHP 8 */
|
|
|
167b2db |
+#ifndef TSRMLS_CC
|
|
|
167b2db |
+#define TSRMLS_CC
|
|
|
167b2db |
+#endif
|
|
|
167b2db |
|
|
|
167b2db |
ZEND_DECLARE_MODULE_GLOBALS(geoip)
|
|
|
167b2db |
|
|
|
167b2db |
+ZEND_BEGIN_ARG_INFO_EX(arginfo_geoip_void, 0, 0, 0)
|
|
|
167b2db |
+ZEND_END_ARG_INFO()
|
|
|
167b2db |
+
|
|
|
167b2db |
+ZEND_BEGIN_ARG_INFO_EX(arginfo_geoip_database_opt, 0, 0, 0)
|
|
|
167b2db |
+ ZEND_ARG_INFO(0, database)
|
|
|
167b2db |
+ZEND_END_ARG_INFO()
|
|
|
167b2db |
+
|
|
|
167b2db |
+ZEND_BEGIN_ARG_INFO_EX(arginfo_geoip_database, 0, 0, 1)
|
|
|
167b2db |
+ ZEND_ARG_INFO(0, database)
|
|
|
167b2db |
+ZEND_END_ARG_INFO()
|
|
|
167b2db |
+
|
|
|
167b2db |
+ZEND_BEGIN_ARG_INFO_EX(arginfo_geoip_host, 0, 0, 1)
|
|
|
167b2db |
+ ZEND_ARG_INFO(0, host)
|
|
|
167b2db |
+ZEND_END_ARG_INFO()
|
|
|
167b2db |
+
|
|
|
167b2db |
+ZEND_BEGIN_ARG_INFO_EX(arginfo_geoip_region, 0, 0, 2)
|
|
|
167b2db |
+ ZEND_ARG_INFO(0, country_code)
|
|
|
167b2db |
+ ZEND_ARG_INFO(0, region_code)
|
|
|
167b2db |
+ZEND_END_ARG_INFO()
|
|
|
167b2db |
+
|
|
|
167b2db |
+ZEND_BEGIN_ARG_INFO_EX(arginfo_geoip_directory, 0, 0, 1)
|
|
|
167b2db |
+ ZEND_ARG_INFO(0, directory)
|
|
|
167b2db |
+ZEND_END_ARG_INFO()
|
|
|
167b2db |
+
|
|
|
167b2db |
static int le_geoip;
|
|
|
167b2db |
|
|
|
167b2db |
/* {{{ */
|
|
|
167b2db |
zend_function_entry geoip_functions[] = {
|
|
|
167b2db |
- PHP_FE(geoip_database_info, NULL)
|
|
|
167b2db |
+ PHP_FE(geoip_database_info, arginfo_geoip_database_opt)
|
|
|
167b2db |
#define GEOIPDEF(php_func, c_func, db_type) \
|
|
|
167b2db |
- PHP_FE(php_func, NULL)
|
|
|
167b2db |
+ PHP_FE(php_func, arginfo_geoip_host)
|
|
|
167b2db |
#include "geoip.def"
|
|
|
167b2db |
#undef GEOIPDEF
|
|
|
167b2db |
- PHP_FE(geoip_continent_code_by_name, NULL)
|
|
|
167b2db |
- PHP_FE(geoip_org_by_name, NULL)
|
|
|
167b2db |
- PHP_FE(geoip_record_by_name, NULL)
|
|
|
167b2db |
- PHP_FE(geoip_id_by_name, NULL)
|
|
|
167b2db |
- PHP_FE(geoip_region_by_name, NULL)
|
|
|
167b2db |
- PHP_FE(geoip_isp_by_name, NULL)
|
|
|
167b2db |
- PHP_FE(geoip_db_avail, NULL)
|
|
|
167b2db |
- PHP_FE(geoip_db_get_all_info, NULL)
|
|
|
167b2db |
- PHP_FE(geoip_db_filename, NULL)
|
|
|
167b2db |
+ PHP_FE(geoip_continent_code_by_name, arginfo_geoip_host)
|
|
|
167b2db |
+ PHP_FE(geoip_org_by_name, arginfo_geoip_host)
|
|
|
167b2db |
+ PHP_FE(geoip_record_by_name, arginfo_geoip_host)
|
|
|
167b2db |
+ PHP_FE(geoip_id_by_name, arginfo_geoip_host)
|
|
|
167b2db |
+ PHP_FE(geoip_region_by_name, arginfo_geoip_host)
|
|
|
167b2db |
+ PHP_FE(geoip_isp_by_name, arginfo_geoip_host)
|
|
|
167b2db |
+ PHP_FE(geoip_db_avail, arginfo_geoip_database)
|
|
|
167b2db |
+ PHP_FE(geoip_db_get_all_info, arginfo_geoip_void)
|
|
|
167b2db |
+ PHP_FE(geoip_db_filename, arginfo_geoip_database)
|
|
|
167b2db |
#if LIBGEOIP_VERSION >= 1004001
|
|
|
167b2db |
- PHP_FE(geoip_region_name_by_code, NULL)
|
|
|
167b2db |
- PHP_FE(geoip_time_zone_by_country_and_region, NULL)
|
|
|
167b2db |
+ PHP_FE(geoip_region_name_by_code, arginfo_geoip_region)
|
|
|
167b2db |
+ PHP_FE(geoip_time_zone_by_country_and_region, arginfo_geoip_region)
|
|
|
167b2db |
#endif
|
|
|
167b2db |
#ifdef HAVE_CUSTOM_DIRECTORY
|
|
|
167b2db |
- PHP_FE(geoip_setup_custom_directory, NULL)
|
|
|
167b2db |
+ PHP_FE(geoip_setup_custom_directory, arginfo_geoip_directory)
|
|
|
167b2db |
#endif
|
|
|
167b2db |
- PHP_FE(geoip_asnum_by_name, NULL)
|
|
|
167b2db |
- PHP_FE(geoip_domain_by_name, NULL)
|
|
|
167b2db |
+ PHP_FE(geoip_asnum_by_name, arginfo_geoip_host)
|
|
|
167b2db |
+ PHP_FE(geoip_domain_by_name, arginfo_geoip_host)
|
|
|
167b2db |
#if LIBGEOIP_VERSION >= 1004008
|
|
|
167b2db |
- PHP_FE(geoip_netspeedcell_by_name, NULL)
|
|
|
167b2db |
+ PHP_FE(geoip_netspeedcell_by_name, arginfo_geoip_host)
|
|
|
167b2db |
#endif
|
|
|
167b2db |
+#ifdef PHP_FE_END
|
|
|
167b2db |
+ PHP_FE_END
|
|
|
167b2db |
+#else
|
|
|
167b2db |
{NULL, NULL, NULL}
|
|
|
167b2db |
+#endif
|
|
|
167b2db |
};
|
|
|
167b2db |
/* }}} */
|
|
|
167b2db |
|