From 519d57deadc46bd5b48b37cd1a28882425d8e204 Mon Sep 17 00:00:00 2001 From: "Nicolas \"Pixel\" Noble" Date: Sat, 7 Jun 2014 17:17:52 -0700 Subject: Fixing DEBUG vs _DEBUG #defines. --- Makefile | 2 +- includes/Exceptions.h | 2 +- src/Printer.cc | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index c920641..5312e48 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ ifeq ($(DEBUG),) CPPFLAGS += -g3 -gdwarf-2 -O3 -DNDEBUG LDFLAGS += -g3 -gdwarf-2 else -CPPFLAGS += -g3 -gdwarf-2 -DDEBUG -DEV_VERIFY=3 +CPPFLAGS += -g3 -gdwarf-2 -D_DEBUG -DEV_VERIFY=3 LDFLAGS += -g3 -gdwarf-2 endif diff --git a/includes/Exceptions.h b/includes/Exceptions.h index 2b20e1e..f68239f 100644 --- a/includes/Exceptions.h +++ b/includes/Exceptions.h @@ -98,7 +98,7 @@ static inline void * realloc(void * previous, size_t size) { }; static inline void AssertHelperInner(const String & msg, const char * details = NULL) throw (GeneralException) { -#if defined(_MSC_VER) && defined(DEBUG) +#if defined(_MSC_VER) && defined(_DEBUG) __debugbreak(); #endif throw GeneralException(msg, details); diff --git a/src/Printer.cc b/src/Printer.cc index 7eb02d8..604eca1 100644 --- a/src/Printer.cc +++ b/src/Printer.cc @@ -17,7 +17,7 @@ static const char * prefixes[] = { }; Balau::Printer::Printer() { -#ifdef DEBUG +#ifdef _DEBUG m_detailledLogs = true; #endif if (!localPrinter.getGlobal()) -- cgit v1.2.3