parent
cf40f8e42e
commit
0ebccb5bf0
2
INSTALL
2
INSTALL
|
|
@ -21,5 +21,5 @@ Debian, Ubuntu etc.:
|
||||||
# the command lines as:
|
# the command lines as:
|
||||||
|
|
||||||
git clone https://github.com/happyfish100/libfastcommon.git
|
git clone https://github.com/happyfish100/libfastcommon.git
|
||||||
cd libfastcommon; git checkout V1.0.84
|
cd libfastcommon; git checkout V1.0.85
|
||||||
./make.sh clean && ./make.sh && sudo ./make.sh install
|
./make.sh clean && ./make.sh && sudo ./make.sh install
|
||||||
|
|
|
||||||
|
|
@ -23,7 +23,7 @@
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
#include <errno.h>
|
#include <errno.h>
|
||||||
#include <time.h>
|
#include <time.h>
|
||||||
#include "common_define.h"
|
#include "fc_version.h"
|
||||||
#include "local_ip_func.h"
|
#include "local_ip_func.h"
|
||||||
#include "logger.h"
|
#include "logger.h"
|
||||||
#include "hash.h"
|
#include "hash.h"
|
||||||
|
|
@ -33,10 +33,6 @@
|
||||||
#include "system_info.h"
|
#include "system_info.h"
|
||||||
#include "fastcommon.h"
|
#include "fastcommon.h"
|
||||||
|
|
||||||
#define MAJOR_VERSION 1
|
|
||||||
#define MINOR_VERSION 0
|
|
||||||
#define PATCH_VERSION 8
|
|
||||||
|
|
||||||
#define IDG_FLAGS_EXTRA_DATA_BY_MOD 1
|
#define IDG_FLAGS_EXTRA_DATA_BY_MOD 1
|
||||||
|
|
||||||
#define PHP_IDG_RESOURCE_NAME "fastcommon_idg"
|
#define PHP_IDG_RESOURCE_NAME "fastcommon_idg"
|
||||||
|
|
@ -312,8 +308,8 @@ PHP_RSHUTDOWN_FUNCTION(fastcommon)
|
||||||
PHP_MINFO_FUNCTION(fastcommon)
|
PHP_MINFO_FUNCTION(fastcommon)
|
||||||
{
|
{
|
||||||
char mc_info[64];
|
char mc_info[64];
|
||||||
sprintf(mc_info, "fastcommon v%d.%02d support",
|
sprintf(mc_info, "fastcommon v%d.%d.%d supported",
|
||||||
MAJOR_VERSION, MINOR_VERSION);
|
FC_MAJOR_VERSION, FC_MINOR_VERSION, FC_PATCH_VERSION);
|
||||||
|
|
||||||
php_info_print_table_start();
|
php_info_print_table_start();
|
||||||
php_info_print_table_header(2, mc_info, "enabled");
|
php_info_print_table_header(2, mc_info, "enabled");
|
||||||
|
|
@ -326,12 +322,13 @@ return client library version
|
||||||
*/
|
*/
|
||||||
ZEND_FUNCTION(fastcommon_version)
|
ZEND_FUNCTION(fastcommon_version)
|
||||||
{
|
{
|
||||||
|
Version version;
|
||||||
char szVersion[16];
|
char szVersion[16];
|
||||||
int len;
|
int len;
|
||||||
|
|
||||||
len = sprintf(szVersion, "%d.%d.%d",
|
fc_version(&version);
|
||||||
MAJOR_VERSION, MINOR_VERSION, PATCH_VERSION);
|
len = sprintf(szVersion, "%d.%d.%d", version.major,
|
||||||
|
version.minor, version.patch);
|
||||||
ZEND_RETURN_STRINGL(szVersion, len, 1);
|
ZEND_RETURN_STRINGL(szVersion, len, 1);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue