mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-09-01 01:41:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

yaft: fix debug logging

Browse Source 
DEBUG was defined at least in configure's config.h, so it conflicts with
the enum definition


Origin commit data
------------------
Commit: b46ee0cec7
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2018-01-15 (Mon, 15 Jan 2018)
This commit is contained in:
Stefan Seyfried
2018-01-15 19:54:51 +01:00
committed by vanhofen
parent f253d85186
commit f87cfe0b56
2 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/gui/widget/yaft/fb/neutrinofb.h
View File

@@ -22,6 +22,10 @@
* in all copies or substantial portions of the Software. * in all copies or substantial portions of the Software.
*/ */
#include <driver/framebuffer.h> #include <driver/framebuffer.h>
#ifdef DEBUG
/* maybe on compiler command line or in neutrino config.h */
#undef DEBUG
#endif
enum { enum {
CMAP_COLOR_LENGTH = sizeof(__u16) * BITS_PER_BYTE, CMAP_COLOR_LENGTH = sizeof(__u16) * BITS_PER_BYTE,

8
src/gui/widget/yaft/yaft_class.cpp
View File

@@ -21,6 +21,10 @@
* The above copyright notice and this permission notice shall be included * The above copyright notice and this permission notice shall be included
* in all copies or substantial portions of the Software. * in all copies or substantial portions of the Software.
*/ */
#ifdef DEBUG
/* maybe on command line? */
#undef DEBUG
#endif
#include "yaft.h" #include "yaft.h"
#include "conf.h" #include "conf.h"
#include "util.h" #include "util.h"
@@ -32,6 +36,10 @@
#include "parse.h" #include "parse.h"
#include "yaft_class.h" #include "yaft_class.h"
#include <driver/framebuffer.h> #include <driver/framebuffer.h>
#ifdef DEBUG
#warning DEBUG redefined!
#undef DEBUG
#endif
static void sig_handler(int signo) static void sig_handler(int signo)
{ {