[2/2] mesos git commit: Windows: Removed macro redefinition.

[jo...@apache.org]

Windows: Removed macro redefinition.

The `__STRINGIZE` macro is already defined in Visual Studio headers.

Review: https://reviews.apache.org/r/51861/


Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/45fea210
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/45fea210
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/45fea210

Branch: refs/heads/master
Commit: 45fea210711c7a2e3c0e2cdacd5ca29d07453888
Parents: 862da54
Author: Daniel Pravat <dp...@outlook.com>
Authored: Fri Sep 16 17:06:16 2016 -0700
Committer: Joseph Wu <jo...@apache.org>
Committed: Fri Sep 16 17:07:26 2016 -0700

----------------------------------------------------------------------
 3rdparty/stout/include/stout/abort.hpp | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/mesos/blob/45fea210/3rdparty/stout/include/stout/abort.hpp
----------------------------------------------------------------------
diff --git a/3rdparty/stout/include/stout/abort.hpp b/3rdparty/stout/include/stout/abort.hpp
index 9fa6f84..b7dba03 100644
--- a/3rdparty/stout/include/stout/abort.hpp
+++ b/3rdparty/stout/include/stout/abort.hpp
@@ -28,10 +28,13 @@
 
 #include <stout/attributes.hpp>
 
-
-// Signal safe abort which prints a message.
+// NOTE: These macros are already defined in Visual Studio (Windows) headers.
+#ifndef __WINDOWS__
 #define __STRINGIZE(x) #x
 #define _STRINGIZE(x) __STRINGIZE(x)
+#endif // __WINDOWS__
+
+// Signal safe abort which prints a message.
 #define _ABORT_PREFIX "ABORT: (" __FILE__ ":" _STRINGIZE(__LINE__) "): "
 
 #define ABORT(...) _Abort(_ABORT_PREFIX, __VA_ARGS__)