Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ac7412c6 authored by Dan Albert's avatar Dan Albert Committed by Android Git Automerger
Browse files

am c95ca14a: am 8b9170b8: Merge "Add additional shielding against the ERROR macro." 

* commit 'c95ca14a':
  Add additional shielding against the ERROR macro.
parents b2ca6188 c95ca14a

base/include/base/logging.h

+9 −0
Original line number Diff line number Diff line
@@ -17,6 +17,15 @@ 
#ifndef BASE_LOGGING_H

#define BASE_LOGGING_H



#ifdef ERROR

#error ERROR is already defined. If this is Windows code, #define NOGDI before \

including anything.

#endif



#ifdef _WIN32

#define NOGDI // Suppress the evil ERROR macro.

#endif



#include <functional>

#include <memory>

#include <ostream>

base/logging.cpp

+0 −1
Original line number Diff line number Diff line
@@ -35,7 +35,6 @@ 
#ifndef _WIN32

#include <mutex>

#else

#define NOGDI // Suppress the evil ERROR macro.

#include <windows.h>

#endif