Skip to content

Commit f5fca7a

Browse files
committed
PCBC-231: Remove obsolete version string
Change-Id: I271cb3a90a2b61d2158f51c26a71894e79074090 Reviewed-on: http://review.couchbase.org/26235 Reviewed-by: Trond Norbye <trond.norbye@gmail.com> Tested-by: Trond Norbye <trond.norbye@gmail.com>
1 parent 23cda02 commit f5fca7a

File tree

2 files changed

+4
-5
lines changed

2 files changed

+4
-5
lines changed

apidecl.c

+4-4
Original file line numberDiff line numberDiff line change
@@ -813,7 +813,7 @@ PHP_METHOD(couchbase, getVersion)
813813

814814
PHP_METHOD(couchbase, getClientVersion)
815815
{
816-
RETURN_STRING(PHP_COUCHBASE_VERSION, 1);
816+
RETURN_STRING(PHP_COUCHBASE_VERSION_STRING, 1);
817817
}
818818

819819
PHP_METHOD(couchbase, getNumReplicas)
@@ -1047,7 +1047,7 @@ PHP_FUNCTION(couchbase_get_version)
10471047

10481048
PHP_FUNCTION(couchbase_get_client_version)
10491049
{
1050-
RETURN_STRING(PHP_COUCHBASE_VERSION, 1);
1050+
RETURN_STRING(PHP_COUCHBASE_VERSION_STRING, 1);
10511051
}
10521052

10531053
PHP_FUNCTION(couchbase_get_num_replicas)
@@ -1148,7 +1148,7 @@ zend_module_entry couchbase_module_entry = {
11481148
PHP_RSHUTDOWN(couchbase), /* Replace with NULL if there's nothing to do at request end */
11491149
PHP_MINFO(couchbase),
11501150
#if ZEND_MODULE_API_NO >= 20010901
1151-
PHP_COUCHBASE_VERSION,
1151+
PHP_COUCHBASE_VERSION_STRING,
11521152
#endif
11531153
PHP_MODULE_GLOBALS(couchbase),
11541154
PHP_GINIT(couchbase),
@@ -1347,7 +1347,7 @@ PHP_MINFO_FUNCTION(couchbase)
13471347
{
13481348
php_info_print_table_start();
13491349
php_info_print_table_header(2, "couchbase support", "enabled");
1350-
php_info_print_table_row(2, "version", PHP_COUCHBASE_VERSION);
1350+
php_info_print_table_row(2, "version", PHP_COUCHBASE_VERSION_STRING);
13511351
php_info_print_table_row(2, "libcouchbase version", lcb_get_version(NULL));
13521352
php_info_print_table_row(2, "json support", "yes");
13531353
php_info_print_table_row(2, "fastlz support", "yes");

internal.h

-1
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,6 @@
8282
#define COUCHBASE_G(v) (couchbase_globals.v)
8383
#endif
8484

85-
#define PHP_COUCHBASE_VERSION "1.1.4dp1"
8685
#define PHP_COUCHBASE_RESOURCE "Couchbase"
8786
#define PHP_COUCHBASE_PERSISTENT_RESOURCE "Persistent Couchbase"
8887
#define COUCHBASE_PROPERTY_HANDLE "_handle"

0 commit comments

Comments
 (0)