Merge pull request matplotlib#4519 from frenchwr/master

efiring · efiring · commit ddf4a887fc81 · 2015-06-14T11:29:53.000-10:00
Removing intel preprocessors from qhull_a.h
diff --git a/extern/qhull/qhull_a.h b/extern/qhull/qhull_a.h
@@ -102,13 +102,8 @@
 #elif defined(__MWERKS__) && defined(__INTEL__)
 #   define QHULL_OS_WIN
 #endif
-#if defined(__INTEL_COMPILER) && !defined(QHULL_OS_WIN)
-template <typename T>
-inline void qhullUnused(T &x) { (void)x; }
-#  define QHULL_UNUSED(x) qhullUnused(x);
-#else
-#  define QHULL_UNUSED(x) (void)x;
-#endif
+
+#define QHULL_UNUSED(x) (void)x;
 
 /***** -libqhull.c prototypes (alphabetical after qhull) ********************/
 
