fix build-break in case secure log is disable

Change-Id: Ifa5c8e7ca49d8de7ab4de48ac235ca7c03a84ab7

diff --git a/lib/xdbg_log.h b/lib/xdbg_log.h
index 5cf4668..bf25260 100644 (file)
--- a/lib/xdbg_log.h
+++ b/lib/xdbg_log.h
@@ -118,7 +118,7 @@ void* xDbgLog            (unsigned int module, int logoption, const char *file,
 #ifdef _SECURE_LOG
 #define XDBG_SECURE(mod, fmt, ARG...)     XLOG_SECURE(mod, "[%s] "fmt, __FUNCTION__, ##ARG)
 #else
-#define XDBG_SECURE(mod, fmt, ARG...)     (0)
+#define XDBG_SECURE(mod, fmt, ARG...)     do { } while(0)
 #endif
 
 #define XDBG_NEVER_GET_HERE(mod)          XLOG_ERROR(mod, "[%s:%d] ** NEVER GET HERE **\n", __FUNCTION__,__LINE__)

diff --git a/module/xdbg_module_evlog.c b/module/xdbg_module_evlog.c
index 2558391..2722891 100644 (file)
--- a/module/xdbg_module_evlog.c
+++ b/module/xdbg_module_evlog.c
@@ -402,6 +402,7 @@ static void evtPrint (EvlogType type, ClientPtr client, xEvent *ev, ReplyInfoRec
     xDbgDistroyRegionList(&evinfo);
 }
 
+#ifdef _SECURE_LOG
 static const char*
 _traceGetWindowName (ClientPtr client, Window window)
 {
@@ -435,6 +436,7 @@ _traceGetWindowName (ClientPtr client, Window window)
 
     return NULL;
 }
+#endif
 
 static void
 _traceFlush (CallbackListPtr *pcbl, pointer nulldata, pointer calldata)
@@ -465,6 +467,8 @@ _traceEvent (CallbackListPtr *pcbl, pointer nulldata, pointer calldata)
     int ev; /* event index */
     static int xi2_opcode = -1;
     xEvent *pev;
+
+#ifdef _SECURE_LOG
     static char* ename[]=
     {
         "KeyPress",
@@ -472,6 +476,7 @@ _traceEvent (CallbackListPtr *pcbl, pointer nulldata, pointer calldata)
         "ButtonPress",
         "ButtonRelease",
     };
+#endif
 
     XDBG_RETURN_IF_FAIL (pei != NULL);