luo980/glog
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix autotools build.

Browse Source 
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.
This commit is contained in:
Peter Collingbourne 2016-06-22 18:34:48 -07:00
parent de6149ef8e
commit 8e98eb2a5a
2 changed files with 1 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/config.h.in
View File

@ -178,12 +178,3 @@
/* Puts following code inside the Google namespace */ /* Puts following code inside the Google namespace */
#undef _START_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

1
src/demangle.h
View File

@ -71,6 +71,7 @@
#define BASE_DEMANGLE_H_ #define BASE_DEMANGLE_H_
#include "config.h" #include "config.h"
#include "glog/logging.h"
_START_GOOGLE_NAMESPACE_ _START_GOOGLE_NAMESPACE_