Fix symbol conflict reported on macos

Change-Id: I3ca8baedd903e012ac8404fce5d916c485b8629f
Reviewed-on: http://review.couchbase.org/109812
Tested-by: Build Bot <[email protected]>
Reviewed-by: Sergey Avseyev <[email protected]>

Author: avsej

src/couchbase/mutation_state.c

@@ -19,6 +19,7 @@
 
 #define LOGARGS(lvl) LCB_LOG_##lvl, NULL, "pcbc/mutation_state", __FILE__, __LINE__
 
+extern zend_class_entry *pcbc_mutation_token_legacy_ce;
 zend_class_entry *pcbc_mutation_state_ce;
 
 PHP_METHOD(MutationState, __construct)
@@ -62,20 +63,20 @@ static void pcbc_add_token(pcbc_mutation_state_t *state, pcbc_mutation_token_t *
 }
 
 #define ADD_TOKEN_FROM_ZVAL(source)                                                                                    \
-    if (instanceof_function(Z_OBJCE_P(source), pcbc_mutation_token_ce TSRMLS_CC)) {                                    \
+    if (instanceof_function(Z_OBJCE_P(source), pcbc_mutation_token_legacy_ce TSRMLS_CC)) {                                    \
         pcbc_add_token(state, Z_MUTATION_TOKEN_OBJ_P(source) TSRMLS_CC);                                               \
     } else if (instanceof_function(Z_OBJCE_P(source), pcbc_document_ce TSRMLS_CC)) {                                   \
         zval *val;                                                                                                     \
         PCBC_READ_PROPERTY(val, pcbc_document_ce, source, "token", 0);                                                 \
         if (val && Z_TYPE_P(val) == IS_OBJECT &&                                                                       \
-            instanceof_function(Z_OBJCE_P(val), pcbc_mutation_token_ce TSRMLS_CC)) {                                   \
+            instanceof_function(Z_OBJCE_P(val), pcbc_mutation_token_legacy_ce TSRMLS_CC)) {                                   \
             pcbc_add_token(state, Z_MUTATION_TOKEN_OBJ_P(val) TSRMLS_CC);                                              \
         }                                                                                                              \
     } else if (instanceof_function(Z_OBJCE_P(source), pcbc_document_fragment_ce TSRMLS_CC)) {                          \
         zval *val;                                                                                                     \
         PCBC_READ_PROPERTY(val, pcbc_document_fragment_ce, source, "token", 0);                                        \
         if (val && Z_TYPE_P(val) == IS_OBJECT &&                                                                       \
-            instanceof_function(Z_OBJCE_P(val), pcbc_mutation_token_ce TSRMLS_CC)) {                                   \
+            instanceof_function(Z_OBJCE_P(val), pcbc_mutation_token_legacy_ce TSRMLS_CC)) {                                   \
             pcbc_add_token(state, Z_MUTATION_TOKEN_OBJ_P(val) TSRMLS_CC);                                              \
         }                                                                                                              \
     } else {                                                                                                           \

src/couchbase/mutation_token.c

@@ -19,7 +19,7 @@
 
 #define LOGARGS(lvl) LCB_LOG_##lvl, NULL, "pcbc/mutation_token", __FILE__, __LINE__
 
-zend_class_entry *pcbc_mutation_token_ce;
+zend_class_entry *pcbc_mutation_token_legacy_ce;
 
 PHP_METHOD(MutationToken, __construct)
 {
@@ -133,7 +133,7 @@ void pcbc_mutation_token_init(zval *return_value, const char *bucket, const lcb_
 {
     pcbc_mutation_token_t *token;
 
-    object_init_ex(return_value, pcbc_mutation_token_ce);
+    object_init_ex(return_value, pcbc_mutation_token_legacy_ce);
     token = Z_MUTATION_TOKEN_OBJ_P(return_value);
     token->bucket = estrdup(bucket);
     token->mt = *mt;
@@ -198,9 +198,9 @@ PHP_MINIT_FUNCTION(MutationToken)
     zend_class_entry ce;
 
     INIT_NS_CLASS_ENTRY(ce, "Couchbase", "MutationTokenLegacy", mutation_token_methods);
-    pcbc_mutation_token_ce = zend_register_internal_class(&ce TSRMLS_CC);
-    pcbc_mutation_token_ce->create_object = mutation_token_create_object;
-    PCBC_CE_DISABLE_SERIALIZATION(pcbc_mutation_token_ce);
+    pcbc_mutation_token_legacy_ce = zend_register_internal_class(&ce TSRMLS_CC);
+    pcbc_mutation_token_legacy_ce->create_object = mutation_token_create_object;
+    PCBC_CE_DISABLE_SERIALIZATION(pcbc_mutation_token_legacy_ce);
 
     memcpy(&pcbc_mutation_token_handlers, zend_get_std_object_handlers(), sizeof(zend_object_handlers));
     pcbc_mutation_token_handlers.get_debug_info = mutation_token_get_debug_info;