Changeset 839

Timestamp:

Mar 18, 2011, 10:37:39 PM (14 years ago)

Author:

Dmitry A. Kuminov

Message:

xsystray: Put primitive logging macros to the header to make them accessible in any source.

Location:

trunk/src/3rdparty/os2/xsystray

Files:

• apilib/xsystray.c (modified) (1 diff)
• plugin/w_xsystray.c (modified) (3 diffs)
• plugin/w_xsystray.h (modified) (2 diffs)

trunk/src/3rdparty/os2/xsystray/apilib/xsystray.c

@@ -32 +32 @@
 #define XSTAPI_IMPL
 #include "xsystray.h"
+
+//#define ENABLE_LOG_TO "c:\\xsystray_api.dbg"
 
 #include "w_xsystray.h"

trunk/src/3rdparty/os2/xsystray/plugin/w_xsystray.c

@@ -47 +47 @@
 #include <string.h>
 #include <stdlib.h>
-#include <stdarg.h>
 
 // generic headers
@@ -77 +76 @@
 #include "shared\center.h"              // public XCenter interfaces
 
+//#define ENABLE_LOG_TO "c:\\xsystray_plugin.dbg"
+
 #include "w_xsystray.h"
 
@@ -106 +107 @@
 #define TTM_UPDATETIPTEXT           (TTM_FIRST + 9)
 #define TTM_SHOWTOOLTIPNOW          (TTM_FIRST + 17)
-
-// primitive debug logging to a file
-#if 0
-static void __LOG_WORKER(const char *fmt, ...)
-{
-    static FILE *f = NULL;
-    if (f == NULL)
-    {
-        f = fopen("c:\\xsystray.dbg", "a");
-        setbuf(f, NULL);
-    }
-    if (f != NULL)
-    {
-        va_list vl;
-        va_start(vl, fmt);
-        vfprintf(f, fmt, vl);
-        va_end(vl);
-    }
-}
-#define LOG(m)  do { __LOG_WORKER m; } while(0)
-#define LOGF(m) do { __LOG_WORKER("%s: ", __FUNCTION__); __LOG_WORKER m; } while(0)
-#else
-#define LOG(m)  do {} while (0)
-#define LOGF(m) do {} while (0)
-#endif
 
 /* ******************************************************************

trunk/src/3rdparty/os2/xsystray/plugin/w_xsystray.h

@@ -19 +19 @@
  */
 
-#ifndef XSYSTRAY_HEADER_INCLUDED
-#define XSYSTRAY_HEADER_INCLUDED
+#ifndef W_XSYSTRAY_HEADER_INCLUDED
+#define W_XSYSTRAY_HEADER_INCLUDED
+
+#include <sys/builtin.h>        // atomics
+
+// primitive debug logging to a file (usage: #define ENABLE_LOG_TO "some_file")
+#ifdef ENABLE_LOG_TO
+#include <stdio.h>
+#include <stdarg.h>
+static void __LOG_WORKER(const char *fmt, ...)
+{
+    static FILE *f = NULL;
+    if (f == NULL)
+    {
+        f = fopen(ENABLE_LOG_TO, "a");
+        setbuf(f, NULL);
+    }
+    if (f != NULL)
+    {
+        va_list vl;
+        va_start(vl, fmt);
+        vfprintf(f, fmt, vl);
+        va_end(vl);
+    }
+}
+#define LOG(m)  do { __LOG_WORKER m; } while(0)
+#define LOGF(m) do { __LOG_WORKER("%s: ", __FUNCTION__); __LOG_WORKER m; } while(0)
+#else
+#define LOG(m)  do {} while (0)
+#define LOGF(m) do {} while (0)
+#endif
 
 #include "xsystray.h"
-
-#include <sys/builtin.h>        // atomics
 
 #define XSYSTRAY_VERSION_MAJOR 0
@@ -204 +231 @@
 }
 
-#endif // XSYSTRAY_HEADER_INCLUDED
-
-
+#endif // W_XSYSTRAY_HEADER_INCLUDED
+
+