Fix symbol conflicts

Author: Timandes

config.m4

@@ -108,7 +108,7 @@ if test "$PHP_ZOOKEEPER" != "no"; then
 
     AC_DEFINE(THREADED,1,[Must define this constant after zookeeper-3.5.0 to use multi-threaded library])
     PHP_SUBST(ZOOKEEPER_SHARED_LIBADD)
-    PHP_NEW_EXTENSION(zookeeper, php_zookeeper.c zoo_lock.c $SESSION_EXTRA_FILES php_zookeeper_exceptions.c php_zookeeper_config_class.c php_zookeeper_stat.c php_zookeeper_callback.c, $ext_shared,,$SESSION_INCLUDES)
+    PHP_NEW_EXTENSION(zookeeper, php_zookeeper.c zoo_lock.c $SESSION_EXTRA_FILES php_zookeeper_exceptions.c php_zookeeper_config_class.c php_zookeeper_stat.c php_zookeeper_callback.c php_zookeeper_log.c, $ext_shared,,$SESSION_INCLUDES)
 
   fi
 

php_zookeeper.c

@@ -54,7 +54,7 @@
 #include "php_zookeeper_config_class.h"
 #include "php_zookeeper_stat.h"
 #include "php_zookeeper_callback.h"
-#include "zookeeper34to35.h"
+#include "php_zookeeper_log.h"
 
 /****************************************
   Helper macros
@@ -396,7 +396,7 @@ static PHP_METHOD(Zookeeper, get)
 		RETURN_NULL();
 	}
 
-	PHP_ZK_LOG_INFO(i_obj->zk, "path=%s, cb_data=%p", path, cb_data);
+	php_zk_log_info(i_obj->zk, "path=%s, cb_data=%p", path, cb_data);
 
 	buffer = emalloc (length+1);
 	status = zoo_wget(i_obj->zk, path, (fci.size != 0) ? php_zk_node_watcher_marshal : NULL,
@@ -1074,7 +1074,7 @@ static void php_zk_node_watcher_marshal(zhandle_t *zk, int type, int state, cons
 
 void php_zk_watcher_marshal(zhandle_t *zk, int type, int state, const char *path, void *context)
 {
-	PHP_ZK_LOG_DEBUG(zk, "type=%d, state=%d, path=%s, path(p)=%p, context=%p", type, state, path?path:"", path, context);
+	php_zk_log_debug(zk, "type=%d, state=%d, path=%s, path(p)=%p, context=%p", type, state, path?path:"", path, context);
 
 	php_cb_data_t *cb_data = context;
 
@@ -1120,7 +1120,7 @@ void php_zk_watcher_marshal(zhandle_t *zk, int type, int state, const char *path
 
 static void php_zk_completion_marshal(int rc, const void *context)
 {
-	PHP_ZK_LOG_DEBUG(NULL, "rc=%d, context=%p", rc, context);
+	php_zk_log_debug(NULL, "rc=%d, context=%p", rc, context);
 
 	php_cb_data_t *cb_data = (php_cb_data_t *)context;
 

php_zookeeper.h

@@ -19,7 +19,6 @@
 
 #include <zookeeper.h>
 #include <zookeeper_version.h>
-#include <zookeeper_log.h>
 #include <php.h>
 
 #ifdef HAVE_CONFIG_H

php_zookeeper_log.c

@@ -0,0 +1,47 @@
+/*
+  +----------------------------------------------------------------------+
+  | Copyright (c) 2010 The PHP Group                                     |
+  +----------------------------------------------------------------------+
+  | This source file is subject to version 3.01 of the PHP license,      |
+  | that is bundled with this package in the file LICENSE, and is        |
+  | available through the world-wide-web at the following url:           |
+  | http://www.php.net/license/3_01.txt.                                 |
+  | If you did not receive a copy of the PHP license and are unable to   |
+  | obtain it through the world-wide-web, please send a note to          |
+  | [email protected] so we can mail you a copy immediately.               |
+  +----------------------------------------------------------------------+
+  | Authors: Timandes White <[email protected]>                          |
+  +----------------------------------------------------------------------+
+*/
+
+#include <stdarg.h>
+#include <zookeeper.h>
+#include <zookeeper_log.h> /* Symbol LOG_INFO defined in this file conflicts with the symbol defined in syslog.h */
+#include "php_zookeeper_log.h"
+
+#if ZOO_MAJOR_VERSION>=3 && ZOO_MINOR_VERSION>=5
+#define PHP_ZK_LOG_ERROR(_zh, ...) LOG_ERROR(LOGCALLBACK(_zh), __VA_ARGS__)
+#define PHP_ZK_LOG_WARN(_zh, ...) LOG_WARN(LOGCALLBACK(_zh), __VA_ARGS__)
+#define PHP_ZK_LOG_INFO(_zh, ...) LOG_INFO(LOGCALLBACK(_zh), __VA_ARGS__)
+#define PHP_ZK_LOG_DEBUG(_zh, ...) LOG_DEBUG(LOGCALLBACK(_zh), __VA_ARGS__)
+#else
+#define PHP_ZK_LOG_ERROR(_zh, ...) LOG_ERROR((__VA_ARGS__))
+#define PHP_ZK_LOG_WARN(_zh, ...) LOG_WARN((__VA_ARGS__))
+#define PHP_ZK_LOG_INFO(_zh, ...) LOG_INFO((__VA_ARGS__))
+#define PHP_ZK_LOG_DEBUG(_zh, ...) LOG_DEBUG((__VA_ARGS__))
+#endif
+
+#define PHP_ZK_LOG_FUNC(func, FUNC) \
+	void php_zk_log_##func(zhandle_t *zh, ...)	\
+	{								\
+		va_list msg;				\
+		va_start(msg, zh);			\
+		PHP_ZK_LOG_##FUNC(zh, msg);	\
+		va_end(msg);				\
+	}
+
+
+PHP_ZK_LOG_FUNC(error, ERROR)
+PHP_ZK_LOG_FUNC(warn, WARN)
+PHP_ZK_LOG_FUNC(info, INFO)
+PHP_ZK_LOG_FUNC(debug, DEBUG)

php_zookeeper_log.h

@@ -0,0 +1,25 @@
+/*
+  +----------------------------------------------------------------------+
+  | Copyright (c) 2010 The PHP Group                                     |
+  +----------------------------------------------------------------------+
+  | This source file is subject to version 3.01 of the PHP license,      |
+  | that is bundled with this package in the file LICENSE, and is        |
+  | available through the world-wide-web at the following url:           |
+  | http://www.php.net/license/3_01.txt.                                 |
+  | If you did not receive a copy of the PHP license and are unable to   |
+  | obtain it through the world-wide-web, please send a note to          |
+  | [email protected] so we can mail you a copy immediately.               |
+  +----------------------------------------------------------------------+
+  | Authors: Timandes White <[email protected]>                          |
+  +----------------------------------------------------------------------+
+*/
+
+#ifndef PHP_ZOOKEEPER_LOG_H
+#define PHP_ZOOKEEPER_LOG_H
+
+void php_zk_log_error(zhandle_t *zh, ...);
+void php_zk_log_warn(zhandle_t *zh, ...);
+void php_zk_log_info(zhandle_t *zh, ...);
+void php_zk_log_debug(zhandle_t *zh, ...);
+
+#endif  /* PHP_ZOOKEEPER_LOG_H */