Merge branch 'development' into LTS_development

This commit is contained in:
Thulinma 2017-07-25 15:52:58 +02:00
commit 16ba3a4f3a

View file

@ -21,6 +21,10 @@
#include "config.h" #include "config.h"
static const char * DBG_LVL_LIST[] = {"NONE", "FAIL", "ERROR", "WARN", "INFO", "MEDIUM", "HIGH", "VERYHIGH", "EXTREME", "INSANE", "DONTEVEN"}; static const char * DBG_LVL_LIST[] = {"NONE", "FAIL", "ERROR", "WARN", "INFO", "MEDIUM", "HIGH", "VERYHIGH", "EXTREME", "INSANE", "DONTEVEN"};
#if !defined(PRIu64)
#define PRIu64 "llu"
#endif
#if !defined(__APPLE__) && !defined(__MACH__) && defined(__GNUC__) #if !defined(__APPLE__) && !defined(__MACH__) && defined(__GNUC__)
#include <errno.h> #include <errno.h>