summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorFumitoshi Ukai <fumitoshi.ukai@gmail.com>2016-10-19 07:06:38 (GMT)
committerGitHub <noreply@github.com>2016-10-19 07:06:38 (GMT)
commit7cff62028c20e52b1beb7f0ddb295621a0bdaeea (patch)
treefd958beff6ee59e49e82f20f012fe6515c27e4f2 /src
parentf5cc8631a49cb33714a46845b66ffea5cf2c282b (diff)
parent8e98eb2a5a68fe9d5b710e7ef176126cd8e395ef (diff)
downloadglog-7cff62028c20e52b1beb7f0ddb295621a0bdaeea.zip
glog-7cff62028c20e52b1beb7f0ddb295621a0bdaeea.tar.gz
glog-7cff62028c20e52b1beb7f0ddb295621a0bdaeea.tar.bz2
Merge pull request #116 from pcc/fix2
Fix autotools build.
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_