From 660a2c4d71f5dc4ba24f21ee94bb9f404b9883aa Mon Sep 17 00:00:00 2001
From: Andrea Ponza <laboratorio@cobotica.it>
Date: Mon, 17 Feb 2020 10:20:50 +0100
Subject: [PATCH] move pcl_macros include higher to avoid clash with VTK's X11
 header inclusion

---
 common/include/pcl/pcl_macros.h                             | 6 +-----
 .../include/pcl/visualization/vtk/vtkVertexBufferObject.h   | 3 ++-
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/common/include/pcl/pcl_macros.h b/common/include/pcl/pcl_macros.h
index d06ad4dc72b..5594842c385 100644
--- a/common/include/pcl/pcl_macros.h
+++ b/common/include/pcl/pcl_macros.h
@@ -68,11 +68,7 @@
 #include <boost/cstdint.hpp>
 #include <boost/smart_ptr/shared_ptr.hpp>
 
-//Eigen has an enum that clashes with X11 Success define, which is ultimately included by pcl
-#ifdef Success
-  #undef Success
-#endif
-#include <Eigen/Core>
+#include <Eigen/Core>  // for EIGEN_MAKE_ALIGNED_OPERATOR_NEW
 
 #include <pcl/pcl_config.h>
 
diff --git a/visualization/include/pcl/visualization/vtk/vtkVertexBufferObject.h b/visualization/include/pcl/visualization/vtk/vtkVertexBufferObject.h
index af6d24ca930..ec6985ca983 100644
--- a/visualization/include/pcl/visualization/vtk/vtkVertexBufferObject.h
+++ b/visualization/include/pcl/visualization/vtk/vtkVertexBufferObject.h
@@ -26,13 +26,14 @@
 
 #pragma once
 
+#include <pcl/pcl_macros.h>
+
 #include <vector>
 
 #include "vtkObject.h"
 #include "vtkWeakPointer.h"
 
 #include "vtkgl.h" // Needed for gl data types exposed in API
-#include <pcl/pcl_macros.h>
 
 class vtkCellArray;
 class vtkDataArray;