From 023995e9387ccc301b5bf11b116508708076bab9 Mon Sep 17 00:00:00 2001 From: Jay Sorg Date: Fri, 12 Jul 2013 12:22:48 -0700 Subject: [PATCH] part of merge, no logic change, add -g to Makefile and LLOGLN to xup.c --- xorg/X11R7.6/rdp/Makefile | 2 +- xup/xup.c | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/xorg/X11R7.6/rdp/Makefile b/xorg/X11R7.6/rdp/Makefile index b38d27c0..3b84c43c 100644 --- a/xorg/X11R7.6/rdp/Makefile +++ b/xorg/X11R7.6/rdp/Makefile @@ -43,7 +43,7 @@ LIBS = $(XSRCBASE)/dbe/.libs/libdbe.a \ LLIBS = -Wl,-rpath=$(LIBBASE) -lfreetype -lz -lm -lXfont -lXau \ -lXdmcp -lpixman-1 -lrt -ldl -lcrypto -lGL -lXdamage -CFLAGS = -O2 -Wall -fno-strength-reduce \ +CFLAGS = -g -O2 -Wall -fno-strength-reduce \ -I../../include \ -I../../cfb \ -I../../mfb \ diff --git a/xup/xup.c b/xup/xup.c index 71cd0be3..a4fe39d0 100644 --- a/xup/xup.c +++ b/xup/xup.c @@ -20,6 +20,12 @@ #include "xup.h" +#define LOG_LEVEL 1 +#define LLOG(_level, _args) \ + do { if (_level < LOG_LEVEL) { g_write _args ; } } while (0) +#define LLOGLN(_level, _args) \ + do { if (_level < LOG_LEVEL) { g_writeln _args ; } } while (0) + /******************************************************************************/ /* returns error */ int DEFAULT_CC