summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorPeter Collingbourne <pcc@google.com>2016-06-23 01:34:48 (GMT)
committerPeter Collingbourne <pcc@google.com>2016-06-23 01:48:32 (GMT)
commit8e98eb2a5a68fe9d5b710e7ef176126cd8e395ef (patch)
treea922e522d8f4ec3a6a4c43179ba848c21a5ab7ce /src
parentde6149ef8e67b064a433a8b88924fa9f606ad5d5 (diff)
downloadglog-8e98eb2a5a68fe9d5b710e7ef176126cd8e395ef.zip
glog-8e98eb2a5a68fe9d5b710e7ef176126cd8e395ef.tar.gz
glog-8e98eb2a5a68fe9d5b710e7ef176126cd8e395ef.tar.bz2
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.
Diffstat (limited to 'src')
-rw-r--r--src/config.h.in9
-rw-r--r--src/demangle.h1
2 files changed, 1 insertions, 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_