summaryrefslogtreecommitdiff
path: root/php/src/php5/Init.cpp
diff options
context:
space:
mode:
authorJose <jose@zeroc.com>2016-03-01 15:12:26 +0100
committerJose <jose@zeroc.com>2016-03-01 15:12:26 +0100
commit1419f188bf7d06ba0131cfd94a82f5d43ec0c7dd (patch)
tree38929143a6575d23e4438e590a20f525a829e194 /php/src/php5/Init.cpp
parentFix LMDB nuget package version (diff)
parentIce::identityToString/Ice::stringToIdentity php/ruby/python implementations (diff)
downloadice-1419f188bf7d06ba0131cfd94a82f5d43ec0c7dd.tar.bz2
ice-1419f188bf7d06ba0131cfd94a82f5d43ec0c7dd.tar.xz
ice-1419f188bf7d06ba0131cfd94a82f5d43ec0c7dd.zip
Merge remote-tracking branch 'origin/3.6'
Diffstat (limited to 'php/src/php5/Init.cpp')
-rw-r--r--php/src/php5/Init.cpp8
1 files changed, 6 insertions, 2 deletions
diff --git a/php/src/php5/Init.cpp b/php/src/php5/Init.cpp
index 782d644b6d7..3732b3d09b5 100644
--- a/php/src/php5/Init.cpp
+++ b/php/src/php5/Init.cpp
@@ -33,7 +33,9 @@ ZEND_END_ARG_INFO()
ZEND_FE(Ice_register, NULL) \
ZEND_FE(Ice_unregister, NULL) \
ZEND_FE(Ice_find, NULL) \
- ZEND_FE(Ice_getProperties, NULL)
+ ZEND_FE(Ice_getProperties, NULL) \
+ ZEND_FE(Ice_identityToString, NULL) \
+ ZEND_FE(Ice_stringToIdentity, NULL) \
#ifdef ICEPHP_USE_NAMESPACES
# define ICEPHP_COMMUNICATOR_NS_FUNCTIONS \
@@ -41,7 +43,9 @@ ZEND_END_ARG_INFO()
ZEND_NS_FALIAS("Ice", register, Ice_register, NULL) \
ZEND_NS_FALIAS("Ice", unregister, Ice_unregister, NULL) \
ZEND_NS_FALIAS("Ice", find, Ice_find, NULL) \
- ZEND_NS_FALIAS("Ice", getProperties, Ice_getProperties, NULL)
+ ZEND_NS_FALIAS("Ice", getProperties, Ice_getProperties, NULL) \
+ ZEND_NS_FALIAS("Ice", identityToString, Ice_identityToString, NULL) \
+ ZEND_NS_FALIAS("Ice", stringToIdentity, Ice_stringToIdentity, NULL)
#else
# define ICEPHP_COMMUNICATOR_NS_FUNCTIONS
#endif