diff options
| author | Dreamer <dreamer.dead@gmail.com> | 2016-08-03 10:25:38 +0300 |
|---|---|---|
| committer | Andreas Schuh <andreas.schuh.84@gmail.com> | 2016-08-03 08:25:38 +0100 |
| commit | a69b2544d613b4bee404988710503720c487119a (patch) | |
| tree | bf1976fc84cb41bba44d6458f5eeee263ef5c00e | |
| parent | 15394d356ce12267962abf8cc65da6835cc27de5 (diff) | |
| download | gflags-a69b2544d613b4bee404988710503720c487119a.tar.gz gflags-a69b2544d613b4bee404988710503720c487119a.tar.bz2 gflags-a69b2544d613b4bee404988710503720c487119a.zip | |
Fix Windows linker errors and warnings. (#166)
| -rw-r--r-- | src/gflags.cc | 3 | ||||
| -rw-r--r-- | src/gflags_declare.h.in | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/gflags.cc b/src/gflags.cc index bbd58ec..3464b3f 100644 --- a/src/gflags.cc +++ b/src/gflags.cc @@ -96,6 +96,7 @@ #if defined(HAVE_FNMATCH_H) # include <fnmatch.h> #elif defined(HAVE_SHLWAPI_H) +# define NO_SHLWAPI_ISOS # include <shlwapi.h> #endif #include <stdarg.h> // For va_list and related operations @@ -1467,7 +1468,7 @@ FlagRegisterer::FlagRegisterer(const char* name, // Force compiler to generate code for the given template specialization. #define INSTANTIATE_FLAG_REGISTERER_CTOR(type) \ - template FlagRegisterer::FlagRegisterer( \ + template GFLAGS_DLL_DECL FlagRegisterer::FlagRegisterer( \ const char* name, const char* help, const char* filename, \ type* current_storage, type* defvalue_storage) diff --git a/src/gflags_declare.h.in b/src/gflags_declare.h.in index a8b76f7..5e01198 100644 --- a/src/gflags_declare.h.in +++ b/src/gflags_declare.h.in @@ -56,7 +56,7 @@ // We always want to import variables declared in user code #ifndef GFLAGS_DLL_DECLARE_FLAG -# ifdef _MSC_VER +# if @GFLAGS_IS_A_DLL@ && defined(_MSC_VER) # define GFLAGS_DLL_DECLARE_FLAG __declspec(dllimport) # else # define GFLAGS_DLL_DECLARE_FLAG |