summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorAndreas Schuh <andreas.schuh.84@gmail.com>2014-03-19 17:32:23 +0000
committerAndreas Schuh <andreas.schuh.84@gmail.com>2014-03-19 17:32:23 +0000
commitddc535741996b5ed42bb4d2c1bbcd371573a5bfd (patch)
tree36a5ceaac39300ee26e84bf28836de0f46d72716 /test
parent9242578bc18a220c41ce07e024d620465ec9e434 (diff)
downloadgflags-ddc535741996b5ed42bb4d2c1bbcd371573a5bfd.tar.gz
gflags-ddc535741996b5ed42bb4d2c1bbcd371573a5bfd.tar.bz2
gflags-ddc535741996b5ed42bb4d2c1bbcd371573a5bfd.zip
Add link dependency on shlwapi.lib during build configuration instead of #pragma comment statement. Use this library also on MinGW.
Diffstat (limited to 'test')
-rw-r--r--test/gflags_unittest.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/test/gflags_unittest.cc b/test/gflags_unittest.cc
index 7a44f64..80f7398 100644
--- a/test/gflags_unittest.cc
+++ b/test/gflags_unittest.cc
@@ -408,7 +408,7 @@ TEST(FlagFileTest, FilenamesOurfileFirst) {
-1.0);
}
-#if defined(HAVE_FNMATCH_H) || (defined(_MSC_VER) && defined(HAVE_SHLWAPI_H)) // otherwise glob isn't supported
+#if defined(HAVE_FNMATCH_H) || defined(HAVE_SHLWAPI_H) // otherwise glob isn't supported
TEST(FlagFileTest, FilenamesOurfileGlob) {
FLAGS_test_string = "initial";
FLAGS_test_bool = false;
@@ -460,7 +460,7 @@ TEST(FlagFileTest, FilenamesOurfileInBigList) {
1,
-1.0);
}
-#endif // defined(HAVE_FNMATCH_H) || (defined(_MSC_VER) && defined(HAVE_SHLWAPI_H))
+#endif // defined(HAVE_FNMATCH_H) || defined(HAVE_SHLWAPI_H)
// Tests that a failed flag-from-string read keeps flags at default values
TEST(FlagFileTest, FailReadFlagsFromString) {