COMP: Protect duplicate definition warnings

hjmjohnson · hjmjohnson · commit 0040dc792111 · 2020-03-20T21:29:22.000-05:00
DCMTK also defines HAVE_SSTREAM
diff --git a/tclap/include/tclap/MultiArgOld.h b/tclap/include/tclap/MultiArgOld.h
@@ -32,7 +32,9 @@
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #else
-#define HAVE_SSTREAM
+#  ifndef HAVE_SSTREAM //This may have been defined elsewhere
+#    define HAVE_SSTREAM 1
+#  endif
 #endif
 
 #if defined(HAVE_SSTREAM)
diff --git a/tclap/include/tclap/ValueArgOld.h b/tclap/include/tclap/ValueArgOld.h
@@ -32,7 +32,9 @@
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #else
-#define HAVE_SSTREAM
+#  ifndef HAVE_SSTREAM //This may have been defined elsewhere
+#    define HAVE_SSTREAM 1
+#  endif
 #endif
 
 #if defined(HAVE_SSTREAM)
diff --git a/tclap/include/tclap/ValuesConstraint.h b/tclap/include/tclap/ValuesConstraint.h
@@ -29,7 +29,7 @@
 #  include <config.h>
 #else
 #  ifndef HAVE_SSTREAM //This may have been defined elsewhere
-#  define HAVE_SSTREAM
+#    define HAVE_SSTREAM 1
 #  endif
 #endif
 
diff --git a/tclap/include/tclap/sstream.h b/tclap/include/tclap/sstream.h
@@ -28,7 +28,9 @@
 #if !defined(HAVE_STRSTREAM)
 // Assume sstream is available if strstream is not specified
 // (https://sourceforge.net/p/tclap/bugs/23/)
-#define HAVE_SSTREAM
+#  ifndef HAVE_SSTREAM //This may have been defined elsewhere
+#    define HAVE_SSTREAM 1
+#  endif
 #endif
 
 #if defined(HAVE_SSTREAM)
