From f18f233de25f6af2453d381899a092694c712e8d Mon Sep 17 00:00:00 2001
From: counterpoint <counterpoint@aliro.org>
Date: Tue, 25 Aug 2015 09:23:24 +0100
Subject: [PATCH] Try to resolve unexpected compiler errors

---
 server/core/dcb.c | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/server/core/dcb.c b/server/core/dcb.c
index 1f6eea6a8..e38f2e93b 100644
--- a/server/core/dcb.c
+++ b/server/core/dcb.c
@@ -462,12 +462,18 @@ DCB     *dcb = NULL;
 				 * queue or NULL if the DCB is at the head of the
 				 * queue.  Remove zombiedcb from the zombies list.
 				 */
-				if (previousdcb == NULL)
+				if (NULL == previousdcb)
+                                {
 					zombies = zombiedcb->memdata.next;
-				else
+				}
+                                else
+                                {
 					previousdcb->memdata.next = zombiedcb->memdata.next;
+                                }
 				
-				LOGIF(LD, (skygw_log_write_flush(
+				if (LOG_IS_ENABLED(LD))
+                                { 
+                                    (skygw_log_write_flush(
 					LOGFILE_DEBUG,
 					"%lu [%s] Remove dcb "
 					"%p fd %d in state %s from the "
@@ -476,7 +482,8 @@ DCB     *dcb = NULL;
                                         __func__,
 					zombiedcb,
 					zombiedcb->fd,
-					STRDCBSTATE(zombiedcb->state)))); 
+					STRDCBSTATE(zombiedcb->state)));
+                                }
 				/*<
 				 * Move zombie dcb to linked list of victim dcbs.
                                  * The variable dcb is used to hold the last DCB