26 lines
680 B
Diff
26 lines
680 B
Diff
|
Index: VTK-7.0.0/Filters/StatisticsGnuR/vtkRInterface.cxx
|
||
|
|
===================================================================
|
||
|
|
--- VTK-7.0.0.orig/Filters/StatisticsGnuR/vtkRInterface.cxx
|
||
|
|
+++ VTK-7.0.0/Filters/StatisticsGnuR/vtkRInterface.cxx
|
||
|
|
@@ -20,12 +20,15 @@
|
||
|
|
|
||
|
|
#include "vtkRInterface.h"
|
||
|
|
|
||
|
|
+// uintptr_t is already defined in recent versions of R which therefore causes a
|
||
|
|
+// clash when the same symbol is redefined in stddef.h
|
||
|
|
+
|
||
|
|
// for uintptr_t
|
||
|
|
-#ifdef _MSC_VER
|
||
|
|
-#include <stddef.h>
|
||
|
|
-#else
|
||
|
|
-#include <stdint.h>
|
||
|
|
-#endif
|
||
|
|
+// #ifdef _MSC_VER
|
||
|
|
+// #include <stddef.h>
|
||
|
|
+// #else
|
||
|
|
+// #include <stdint.h>
|
||
|
|
+// #endif
|
||
|
|
|
||
|
|
#include "vtkInformation.h"
|
||
|
|
#include "vtkInformationVector.h"
|