From 8e98eb2a5a68fe9d5b710e7ef176126cd8e395ef Mon Sep 17 00:00:00 2001 From: Peter Collingbourne Date: Wed, 22 Jun 2016 18:34:48 -0700 Subject: [PATCH] Fix autotools build. It looks like commit 3c49b93 modified the auto-generated file src/config.h.in to add a definition of macro GOOGLE_GLOG_DLL_DECL. One of the autotools reverts this change upon running "make", causing the build to fail when a source file includes demangle.h. To fix the problem, revert the change to src/config.h.in and include glog/logging.h from demangle.h which provides a definition of that macro. --- src/config.h.in | 9 --------- src/demangle.h | 1 + 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/src/config.h.in b/src/config.h.in index e41635a..8190f23 100644 --- a/src/config.h.in +++ b/src/config.h.in @@ -178,12 +178,3 @@ /* Puts following code inside the Google namespace */ #undef _START_GOOGLE_NAMESPACE_ - -// Annoying stuff for windows -- makes sure clients can import these functions -#ifndef GOOGLE_GLOG_DLL_DECL -# if defined(_WIN32) && !defined(__CYGWIN__) -# define GOOGLE_GLOG_DLL_DECL __declspec(dllimport) -# else -# define GOOGLE_GLOG_DLL_DECL -# endif -#endif diff --git a/src/demangle.h b/src/demangle.h index 2653029..991b6ff 100644 --- a/src/demangle.h +++ b/src/demangle.h @@ -71,6 +71,7 @@ #define BASE_DEMANGLE_H_ #include "config.h" +#include "glog/logging.h" _START_GOOGLE_NAMESPACE_ -- 2.34.1