Merge pull request google#228 from sergiud/dll-export-fix

Fix for missing exports (fixes google#227)
durswd · Aug 9, 2017 · 30b5d6d · 30b5d6d
2 parents 5677721 + b3c2865
commit 30b5d6d
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 4 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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_