Drop support for logging macro

The way its implemented isn't supported in C89

Change-Id: I224a59c0e9ad6508fd5cb85389ce14f3c3037738
Reviewed-on: http://review.couchbase.org/26923
Reviewed-by: Trond Norbye <trond.norbye@gmail.com>
Tested-by: Trond Norbye <trond.norbye@gmail.com>

adhoc_commands.c

@@ -6,7 +6,6 @@
 
 #include "conflate.h"
 #include "conflate_internal.h"
-#include "conflate_convenience.h"
 
 bool commands_initialized = false;
 
@@ -28,19 +27,21 @@ static enum conflate_mgmt_cb_result process_serverlist(void *opaque,
                                           handle->conf->save_path);
 
         if (priv && strcmp(priv, "yes") == 0) {
-            CONFLATE_LOG(handle, LOG_LVL_INFO,
-                         "Currently using a private config, ignoring update.");
+            handle->conf->log(handle->conf->userdata, LOG_LVL_INFO,
+                              "Currently using a private config, ignoring update.");
             return RV_OK;
         }
         free(priv);
     }
 
-    CONFLATE_LOG(handle, LOG_LVL_INFO, "Processing a serverlist");
+    handle->conf->log(handle->conf->userdata, LOG_LVL_INFO,
+                      "Processing a serverlist");
 
     /* Persist the config lists */
     if (!save_kvpairs(handle, conf, handle->conf->save_path)) {
-        CONFLATE_LOG(handle, LOG_LVL_ERROR, "Can not save config to %s",
-                     handle->conf->save_path);
+        handle->conf->log(handle->conf->userdata, LOG_LVL_ERROR,
+                          "Can not save config to %s",
+                          handle->conf->save_path);
     }
 
     /* Send the config to the callback */

logging.c

@@ -4,7 +4,6 @@
 
 #include "conflate.h"
 #include "conflate_internal.h"
-#include "conflate_convenience.h"
 
 static char* lvl_name(enum conflate_log_level lvl)
 {

persist.c

@@ -5,7 +5,6 @@
 
 #include "conflate.h"
 #include "conflate_internal.h"
-#include "conflate_convenience.h"
 
 kvpair_t* load_kvpairs(conflate_handle_t *handle, const char *filename)
 {

xmpp.c

@@ -6,7 +6,6 @@
 
 #include "conflate.h"
 #include "conflate_internal.h"
-#include "conflate_convenience.h"
 
 /** \private */
 struct command_def {