Commit fec2e498 authored by Ben Boeckel's avatar Ben Boeckel Committed by Kitware Robot

Merge topic 'fix-python-2.7-have-round-macro-redefinition-warning-vs2013'

17414afa Fix HAVE_ROUND-related build warnings in Visual Studio 2013
Acked-by: Kitware Robot's avatarKitware Robot <kwrobot@kitware.com>
Acked-by: Ben Boeckel's avatarBen Boeckel <ben.boeckel@kitware.com>
Acked-by: Jean-Christophe Fillion-Robin's avatarJean-Christophe Fillion-Robin <jchris.fillionr@kitware.com>
Merge-request: !620
parents ab5b693a 17414afa
......@@ -73,18 +73,14 @@ they are system headers. Do NOT add any #undef lines here. */
#endif
#if defined(_MSC_VER) && _MSC_VER >= 1800
#if VTK_PYTHON_VERSION_HEX < 0x03040000
#define HAVE_ROUND
#endif
#define HAVE_ROUND 1
#endif
#include <Python.h>
#if defined(_MSC_VER) && _MSC_VER >= 1800
#if VTK_PYTHON_VERSION_HEX < 0x03040000
#undef HAVE_ROUND
#endif
#endif
#if defined(_MSC_VER)
# pragma warning (pop)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment