summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorShinichiro Hamaji <shinichiro.hamaji@gmail.com>2017-08-09 15:06:08 (GMT)
committerGitHub <noreply@github.com>2017-08-09 15:06:08 (GMT)
commit2a6df66252d266080489c310b8146e63b66b2add (patch)
tree926c269f0c4ac382669bd19134824cb3dfb46227 /src
parent246a5896f12e992188115bf2c7dbcc5242c61271 (diff)
parent1bfae38300bb43357d14050728fdc4834b29dbb9 (diff)
downloadglog-2a6df66252d266080489c310b8146e63b66b2add.zip
glog-2a6df66252d266080489c310b8146e63b66b2add.tar.gz
glog-2a6df66252d266080489c310b8146e63b66b2add.tar.bz2
Merge pull request #228 from sergiud/dll-export-fix
Fix for missing exports (fixes #227)
Diffstat (limited to 'src')
-rw-r--r--src/glog/logging.h.in3
-rw-r--r--src/stacktrace.h3
-rw-r--r--src/stacktrace_windows-inl.h1
-rw-r--r--src/symbolize.h2
4 files changed, 5 insertions, 4 deletions
diff --git a/src/glog/logging.h.in b/src/glog/logging.h.in
index 7b04c1b..5cf4555 100644
--- a/src/glog/logging.h.in
+++ b/src/glog/logging.h.in
@@ -931,7 +931,8 @@ struct CompileAssert {
struct CrashReason;
// Returns true if FailureSignalHandler is installed.
-bool IsFailureSignalHandlerInstalled();
+// Needs to be exported since it's used by the signalhandler_unittest.
+GOOGLE_GLOG_DLL_DECL bool IsFailureSignalHandlerInstalled();
} // namespace glog_internal_namespace_
#define LOG_EVERY_N(severity, n) \
diff --git a/src/stacktrace.h b/src/stacktrace.h
index 8c3e8fe..cb64b33 100644
--- a/src/stacktrace.h
+++ b/src/stacktrace.h
@@ -34,6 +34,7 @@
#define BASE_STACKTRACE_H_
#include "config.h"
+#include "glog/logging.h"
_START_GOOGLE_NAMESPACE_
@@ -53,7 +54,7 @@ _START_GOOGLE_NAMESPACE_
// .... ...
//
// "result" must not be NULL.
-extern int GetStackTrace(void** result, int max_depth, int skip_count);
+GOOGLE_GLOG_DLL_DECL int GetStackTrace(void** result, int max_depth, int skip_count);
_END_GOOGLE_NAMESPACE_
diff --git a/src/stacktrace_windows-inl.h b/src/stacktrace_windows-inl.h
index c747d96..7263188 100644
--- a/src/stacktrace_windows-inl.h
+++ b/src/stacktrace_windows-inl.h
@@ -38,7 +38,6 @@
_START_GOOGLE_NAMESPACE_
-GOOGLE_GLOG_DLL_DECL
int GetStackTrace(void** result, int max_depth, int skip_count) {
if (max_depth > 64) {
max_depth = 64;
diff --git a/src/symbolize.h b/src/symbolize.h
index f617184..86f0c79 100644
--- a/src/symbolize.h
+++ b/src/symbolize.h
@@ -148,7 +148,7 @@ _START_GOOGLE_NAMESPACE_
// symbol name to "out". The symbol name is demangled if possible
// (supports symbols generated by GCC 3.x or newer). Otherwise,
// returns false.
-bool Symbolize(void *pc, char *out, int out_size);
+GOOGLE_GLOG_DLL_DECL bool Symbolize(void *pc, char *out, int out_size);
_END_GOOGLE_NAMESPACE_