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

zapit: fix debug message filenames

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: 9d70399578
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-11-26 (Tue, 26 Nov 2013)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
Stefan Seyfried
2013-11-26 14:08:41 +01:00
parent e3cc662be6
commit d245ceac3d
1 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/zapit/include/zapit/debug.h
View File

@@ -46,11 +46,19 @@
extern int zapit_debug; extern int zapit_debug;
#if defined __NFILE__ #if defined __NFILE__
/* this is ugly. __FILE__ here is always zapit/include/debug.h, if it is called from /* this is ugly.
* src/neutrino.cpp, src/gui/... simply strip less characters */ * __FILE__ here is /.../zapit/include/debug.h when building outside the
static int __striplen = strstr(__FILE__, "src/zapit") ? (strstr(__FILE__, "src/zapit") - __FILE__ + 4) : 0; * source tree, but it is ../../src/zapit/include/zapit/debug.h (relative),
* when building inside the source_tree.
* So we cannot find the real filename here. Hack: when including this file
* from src/neutrino.cpp, src/gui/..., __NFILE__ is defined => strip less characters
* Later on, __FILE__ is the real filename, so if it starts with ../ now, the build
* is from within the source tree => __FILE__ is only basename => strip nothing */
static int __striplen = (strncmp(__FILE__, "../", 3) == 0) ? 0 :
(strstr(__FILE__, "src/zapit") != NULL) ? (strstr(__FILE__, "src/zapit") - __FILE__ + 4) : 0;
#else #else
static int __striplen = strstr(__FILE__, "src/zapit") ? (strstr(__FILE__, "src/zapit") - __FILE__ + 14) : 0; static int __striplen = (strncmp(__FILE__, "../", 3) == 0) ? 0 :
(strstr(__FILE__, "src/zapit") != NULL) ? (strstr(__FILE__, "src/zapit") - __FILE__ + 14) : 0;
#endif #endif
#define __SHORTFILE__ (__FILE__ + __striplen) #define __SHORTFILE__ (__FILE__ + __striplen)