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

Commit b7930843 authored by Dan Albert's avatar Dan Albert Committed by Gerrit Code Review
Browse files

Merge "adb / libbase: clean up NOGDI and evil ERROR macro"

parents 9ab8c973 ac3f7d9a

adb/Android.mk

+0 −6
Original line number Diff line number Diff line
@@ -96,9 +96,6 @@ LOCAL_STATIC_LIBRARIES := libcrypto_static 


ifeq ($(HOST_OS),windows)

    LOCAL_C_INCLUDES += development/host/windows/usb/api/

    # Windows.h defines an awful ERROR macro that collides with base/logging.h.

    # Suppress it with NOGDI.

    LOCAL_CFLAGS += -DNOGDI

endif



include $(BUILD_HOST_STATIC_LIBRARY)
@@ -165,9 +162,6 @@ ifeq ($(HOST_OS),darwin) 
endif



ifeq ($(HOST_OS),windows)

    # Windows.h defines an awful ERROR macro that collides with base/logging.h.

    # Suppress it with NOGDI.

    LOCAL_CFLAGS += -DNOGDI

    LOCAL_LDLIBS += -lws2_32 -lgdi32

    EXTRA_STATIC_LIBS := AdbWinApi

endif

adb/adb_auth_host.cpp

+0 −5
Original line number Diff line number Diff line
@@ -16,11 +16,6 @@ 


#define TRACE_TAG TRACE_AUTH



#ifdef _WIN32

// This blocks some definitions we need on Windows.

#undef NOGDI

#endif



#include "sysdeps.h"

#include "adb_auth.h"

adb/sysdeps_win32.cpp

+0 −3
Original line number Diff line number Diff line
@@ -16,9 +16,6 @@ 


#define TRACE_TAG TRACE_SYSDEPS



// For whatever reason this blocks the definition of ToAscii...

#undef NOGDI



#include "sysdeps.h"



#include <winsock2.h> /* winsock.h *must* be included before windows.h. */

base/include/base/logging.h

+5 −8
Original line number Diff line number Diff line
@@ -13,18 +13,15 @@ 
 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



#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



// NOTE: For Windows, you must include logging.h after windows.h to allow the

// following code to suppress the evil ERROR macro:

#ifdef _WIN32

#ifndef NOGDI

#define NOGDI // Suppress the evil ERROR macro.

// windows.h includes wingdi.h which defines an evil macro ERROR.

#ifdef ERROR

#undef ERROR

#endif

#endif

base/logging.cpp

+4 −2
Original line number Diff line number Diff line
@@ -14,6 +14,10 @@ 
 * limitations under the License.

 */



#ifdef _WIN32

#include <windows.h>

#endif



#include "base/logging.h"



#include <libgen.h>
@@ -34,8 +38,6 @@ 


#ifndef _WIN32

#include <mutex>

#else

#include <windows.h>

#endif



#include "base/macros.h"