Clean up the 'GFLAGS_DLL_DECL' stuff better: reduce use outside of windows/ directory.

R=jyrki
DELTA=33  (0 added, 27 deleted, 6 changed)


Revision created by MOE tool push_codebase.
MOE_MIGRATION=3016


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

src/gflags/gflags.h.in

@@ -88,9 +88,9 @@
 // them.  Our automated opensourcing tools use this as a signal to do
 // appropriate munging for windows, which needs to add GFLAGS_DLL_DECL.
 //
-#ifdef SWIG  // it apparently can't see the define in gflags_declare.h
-# define GFLAGS_DLL_DECL  /**/
-#endif
+#define GFLAGS_DLL_DECL  /* rewritten to be non-empty in windows dir */
+#define GFLAGS_DLL_DEFINE_FLAG  /* rewritten to be non-empty in windows dir */
+
 
 // --------------------------------------------------------------------
 // To actually define a flag in a file, use DEFINE_bool,

src/gflags/gflags_completions.h.in

@@ -118,13 +118,8 @@ $ complete -o bashdefault -o default -o nospace -C                            \
 // them.  Our automated opensourcing tools use this as a signal to do
 // appropriate munging for windows, which needs to add GFLAGS_DLL_DECL.
 //
-#ifndef GFLAGS_DLL_DECL
-# ifdef _MSC_VER
-#   define GFLAGS_DLL_DECL  __declspec(dllimport)
-# else
-#   define GFLAGS_DLL_DECL  /**/
-# endif
-#endif
+#define GFLAGS_DLL_DECL  /* rewritten to be non-empty in windows dir */
+
 
 @ac_google_start_namespace@
 

src/gflags/gflags_declare.h.in

@@ -70,29 +70,7 @@ typedef unsigned __int64 uint64;
 @ac_google_end_namespace@
 
 
-// Annoying stuff for windows -- makes sure clients can import these functions
-// 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
-# ifndef GFLAGS_DLL_DECLARE_FLAG
-#   define GFLAGS_DLL_DECLARE_FLAG  __declspec(dllimport)
-# endif
-# ifndef GFLAGS_DLL_DEFINE_FLAG
-#   define GFLAGS_DLL_DEFINE_FLAG   __declspec(dllexport)
-# endif
-#else
-# ifndef GFLAGS_DLL_DECL
-#   define GFLAGS_DLL_DECL  /**/
-# endif
-# ifndef GFLAGS_DLL_DECLARE_FLAG
-#   define GFLAGS_DLL_DECLARE_FLAG  /**/
-# endif
-# ifndef GFLAGS_DLL_DEFINE_FLAG
-#   define GFLAGS_DLL_DEFINE_FLAG  /**/
-# endif
-#endif
+#define GFLAGS_DLL_DECLARE_FLAG  /* rewritten to be non-empty in windows dir */
 
 namespace fLS {
 

src/windows/gflags/gflags.h

@@ -88,9 +88,13 @@ namespace google {
 // them.  Our automated opensourcing tools use this as a signal to do
 // appropriate munging for windows, which needs to add GFLAGS_DLL_DECL.
 //
-#ifdef SWIG  // it apparently can't see the define in gflags_declare.h
-# define GFLAGS_DLL_DECL  /**/
+#if defined(_MSC_VER) && !defined(GFLAGS_DLL_DECL)
+# define GFLAGS_DLL_DECL  __declspec(dllimport)
 #endif
+#if defined(_MSC_VER) && !defined(GFLAGS_DLL_DEFINE_FLAG)
+# define GFLAGS_DLL_DEFINE_FLAG  __declspec(dllexport)
+#endif
+
 
 // --------------------------------------------------------------------
 // To actually define a flag in a file, use DEFINE_bool,

src/windows/gflags/gflags_completions.h

@@ -118,14 +118,11 @@ $ complete -o bashdefault -o default -o nospace -C                            \
 // them.  Our automated opensourcing tools use this as a signal to do
 // appropriate munging for windows, which needs to add GFLAGS_DLL_DECL.
 //
-#ifndef GFLAGS_DLL_DECL
-# ifdef _MSC_VER
+#if defined(_MSC_VER) && !defined(GFLAGS_DLL_DECL)
 # define GFLAGS_DLL_DECL  __declspec(dllimport)
-# else
-#   define GFLAGS_DLL_DECL  /**/
-# endif
 #endif
 
+
 namespace google {
 
 extern GFLAGS_DLL_DECL void HandleCommandLineCompletions(void);

src/windows/gflags/gflags_declare.h

@@ -70,28 +70,8 @@ typedef unsigned __int64 uint64;
 }
 
 
-// Annoying stuff for windows -- makes sure clients can import these functions
-// 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
-# ifndef GFLAGS_DLL_DECLARE_FLAG
+#if defined(_MSC_VER) && !defined(GFLAGS_DLL_DECLARE_FLAG)
 # define GFLAGS_DLL_DECLARE_FLAG  __declspec(dllimport)
-# endif
-# ifndef GFLAGS_DLL_DEFINE_FLAG
-#   define GFLAGS_DLL_DEFINE_FLAG   __declspec(dllexport)
-# endif
-#else
-# ifndef GFLAGS_DLL_DECL
-#   define GFLAGS_DLL_DECL  /**/
-# endif
-# ifndef GFLAGS_DLL_DECLARE_FLAG
-#   define GFLAGS_DLL_DECLARE_FLAG  /**/
-# endif
-# ifndef GFLAGS_DLL_DEFINE_FLAG
-#   define GFLAGS_DLL_DEFINE_FLAG  /**/
-# endif
 #endif
 
 namespace fLS {