1.1 --- a/src/pEp_internal.h	Mon Mar 13 09:51:53 2017 +0100
     1.2 +++ b/src/pEp_internal.h	Mon Mar 13 15:03:14 2017 +0100
     1.3 @@ -175,16 +175,18 @@
     1.4  
     1.5  #ifdef NDEBUG
     1.6  #define DEBUG_LOG(TITLE, ENTITY, DESC)
     1.7 -#define  LOGD(...)
     1.8  #else
     1.9 -#define DEBUG_LOG(TITLE, ENTITY, DESC) \
    1.10 -    log_event(session, (TITLE), (ENTITY), (DESC), "debug");
    1.11  #ifdef ANDROID
    1.12  #include <android/log.h>
    1.13 -#define  LOG_TAG    "pEpEngine"
    1.14 -#define  LOGD(...)  __android_log_print(ANDROID_LOG_DEBUG, LOG_TAG, __VA_ARGS__)
    1.15 +#define  LOG_MORE(...)  __android_log_print(ANDROID_LOG_DEBUG, "pEpEngine", " %s :: %s :: %s ", __VA_ARGS__);
    1.16 +#else
    1.17 +#include <stdio.h>
    1.18 +#define  LOG_MORE(...)  printf("pEpEngine DEBUG_LOG('%s','%s','%s')\n", __VA_ARGS__);
    1.19  #endif
    1.20 -
    1.21 +#define DEBUG_LOG(TITLE, ENTITY, DESC) {\
    1.22 +    log_event(session, (TITLE), (ENTITY), (DESC), "debug");\
    1.23 +    LOG_MORE((TITLE), (ENTITY), (DESC))\
    1.24 +}
    1.25  #endif
    1.26  
    1.27  // Space tolerant and case insensitive fingerprint string compare