It turns out we don't want all this dll-decl stuff for mingw.

So make the #ifdef correct for mscv-but-not-mingw.

I think the right fix would be to take all this logic out and
insert it via a MOE directive, just for the windows versions
of these files.  This is what ctemplate does.  But it's a
more-major change, and I'm looking to get this release out
today, so I'm submitting this (TBR), since it's a much more
minor change.


Revision created by MOE tool push_codebase.
MOE_MIGRATION=2837


git-svn-id: https://gflags.googlecode.com/svn/trunk@55 6586e3c6-dcc4-952a-343f-ff74eb82781d

src/gflags/gflags_completions.h.in

@@ -119,7 +119,7 @@ $ complete -o bashdefault -o default -o nospace -C                            \
 // appropriate munging for windows, which needs to add GFLAGS_DLL_DECL.
 //
 #ifndef GFLAGS_DLL_DECL
-# ifdef _WIN32
+# ifdef _MSC_VER
 #   define GFLAGS_DLL_DECL  __declspec(dllimport)
 # else
 #   define GFLAGS_DLL_DECL  /**/

src/gflags/gflags_declare.h.in

@@ -71,7 +71,8 @@ typedef unsigned __int64 uint64;
 
 
 // Annoying stuff for windows -- makes sure clients can import these functions
-#if defined(_WIN32)
+// TODO(csilvers): add this only for the windows version of the file.
+#if defined(_MSC_VER)
 # ifndef GFLAGS_DLL_DECL
 #   define GFLAGS_DLL_DECL  __declspec(dllimport)
 # endif

src/windows/gflags/gflags_completions.h

@@ -119,7 +119,7 @@ $ complete -o bashdefault -o default -o nospace -C                            \
 // appropriate munging for windows, which needs to add GFLAGS_DLL_DECL.
 //
 #ifndef GFLAGS_DLL_DECL
-# ifdef _WIN32
+# ifdef _MSC_VER
 #   define GFLAGS_DLL_DECL  __declspec(dllimport)
 # else
 #   define GFLAGS_DLL_DECL  /**/

src/windows/gflags/gflags_declare.h

@@ -71,7 +71,8 @@ typedef unsigned __int64 uint64;
 
 
 // Annoying stuff for windows -- makes sure clients can import these functions
-#if defined(_WIN32)
+// TODO(csilvers): add this only for the windows version of the file.
+#if defined(_MSC_VER)
 # ifndef GFLAGS_DLL_DECL
 #   define GFLAGS_DLL_DECL  __declspec(dllimport)
 # endif