Import 2017-06-07 23:51:09: master 295cbafe

Author Committer Branch Timestamp Parent
jcfr jcfr master 2015-02-03 01:43:55 master b5c2015c
Changeset

COMP: Workaround to fix HAVE_STAT redefined warning in qSlicerCoreApplication

This commit fixes the following warning:

//-------------
In file included from /path/to/Slicer-build/DCMTK/dcmdata/include/dcmtk/dcmdata/dcdatset.h:26:0,
from /path/to/Slicer-build/CTK/Libs/DICOM/Core/ctkDICOMItem.h:28,
from /path/to/Slicer-build/CTK/Libs/DICOM/Core/ctkDICOMDatabase.h:29,
from /path/to/Slicer/Base/QTCore/qSlicerCoreApplication.cxx:101:
/path/to/Slicer-build/DCMTK-build/config/include/dcmtk/config/osconfig.h:540:0: warning: "HAVE_STAT" redefined [enabled by default]
#define HAVE_STAT 1
^
In file included from /path/to/Slicer-build/python-install/include/python2.7/Python.h:58:0,
from /path/to/Slicer-build/CTK-build/CMakeExternals/Install/include/PythonQt/PythonQtPythonInclude.h:93,
from /path/to/Slicer-build/CTK-build/CMakeExternals/Install/include/PythonQt/PythonQtInstanceWrapper.h:45,
from /path/to/Slicer-build/CTK-build/CMakeExternals/Install/include/PythonQt/PythonQt.h:46,
from /path/to/Slicer/Base/QTCore/qSlicerCoreApplication.cxx:52:
/path/to/Slicer-build/python-install/include/python2.7/pyport.h:361:0: note: this is the location of the previous definition
#define HAVE_STAT
^
//-------------

git-svn-id: http://svn.slicer.org/Slicer4/trunk@23952 3bd1e089-480b-0410-8dfb-8563597acbee

mod - Base/QTCore/qSlicerCoreApplication.cxx Diff File