Rename libqhull into internal_libqhull to avoid confusing in includes…

… when there's a /usr/include/libqhull (fixes OSGeo#6590) git-svn-id: https://svn.osgeo.org/gdal/trunk@34641 f0d54148-0727-0410-94bb-9a71ac55c965
jmichel-otb · Jul 12, 2016 · d9ba836 · d9ba836
1 parent 1696613
commit d9ba836
Show file tree

Hide file tree

Showing 31 changed files with 15 additions and 15 deletions.
diff --git a/gdal/alg/libqhull/COPYING.txt → gdal/alg/internal_libqhull/COPYING.txt b/gdal/alg/libqhull/COPYING.txt → gdal/alg/internal_libqhull/COPYING.txt
diff --git a/gdal/alg/libqhull/README.txt → gdal/alg/internal_libqhull/README.txt b/gdal/alg/libqhull/README.txt → gdal/alg/internal_libqhull/README.txt
diff --git a/gdal/alg/libqhull/geom.c → gdal/alg/internal_libqhull/geom.c b/gdal/alg/libqhull/geom.c → gdal/alg/internal_libqhull/geom.c
diff --git a/gdal/alg/libqhull/geom.h → gdal/alg/internal_libqhull/geom.h b/gdal/alg/libqhull/geom.h → gdal/alg/internal_libqhull/geom.h
diff --git a/gdal/alg/libqhull/geom2.c → gdal/alg/internal_libqhull/geom2.c b/gdal/alg/libqhull/geom2.c → gdal/alg/internal_libqhull/geom2.c
diff --git a/gdal/alg/libqhull/global.c → gdal/alg/internal_libqhull/global.c b/gdal/alg/libqhull/global.c → gdal/alg/internal_libqhull/global.c
diff --git a/gdal/alg/libqhull/io.c → gdal/alg/internal_libqhull/io.c b/gdal/alg/libqhull/io.c → gdal/alg/internal_libqhull/io.c
diff --git a/gdal/alg/libqhull/io.h → gdal/alg/internal_libqhull/io.h b/gdal/alg/libqhull/io.h → gdal/alg/internal_libqhull/io.h
diff --git a/gdal/alg/libqhull/libqhull.c → gdal/alg/internal_libqhull/libqhull.c b/gdal/alg/libqhull/libqhull.c → gdal/alg/internal_libqhull/libqhull.c
diff --git a/gdal/alg/libqhull/libqhull.h → gdal/alg/internal_libqhull/libqhull.h b/gdal/alg/libqhull/libqhull.h → gdal/alg/internal_libqhull/libqhull.h
diff --git a/gdal/alg/libqhull/mem.c → gdal/alg/internal_libqhull/mem.c b/gdal/alg/libqhull/mem.c → gdal/alg/internal_libqhull/mem.c
diff --git a/gdal/alg/libqhull/mem.h → gdal/alg/internal_libqhull/mem.h b/gdal/alg/libqhull/mem.h → gdal/alg/internal_libqhull/mem.h
diff --git a/gdal/alg/libqhull/merge.c → gdal/alg/internal_libqhull/merge.c b/gdal/alg/libqhull/merge.c → gdal/alg/internal_libqhull/merge.c
diff --git a/gdal/alg/libqhull/merge.h → gdal/alg/internal_libqhull/merge.h b/gdal/alg/libqhull/merge.h → gdal/alg/internal_libqhull/merge.h
diff --git a/gdal/alg/libqhull/poly.c → gdal/alg/internal_libqhull/poly.c b/gdal/alg/libqhull/poly.c → gdal/alg/internal_libqhull/poly.c
diff --git a/gdal/alg/libqhull/poly.h → gdal/alg/internal_libqhull/poly.h b/gdal/alg/libqhull/poly.h → gdal/alg/internal_libqhull/poly.h
diff --git a/gdal/alg/libqhull/poly2.c → gdal/alg/internal_libqhull/poly2.c b/gdal/alg/libqhull/poly2.c → gdal/alg/internal_libqhull/poly2.c
diff --git a/gdal/alg/libqhull/qhull_a.h → gdal/alg/internal_libqhull/qhull_a.h b/gdal/alg/libqhull/qhull_a.h → gdal/alg/internal_libqhull/qhull_a.h
diff --git a/gdal/alg/libqhull/qset.c → gdal/alg/internal_libqhull/qset.c b/gdal/alg/libqhull/qset.c → gdal/alg/internal_libqhull/qset.c
diff --git a/gdal/alg/libqhull/qset.h → gdal/alg/internal_libqhull/qset.h b/gdal/alg/libqhull/qset.h → gdal/alg/internal_libqhull/qset.h
diff --git a/gdal/alg/libqhull/random.c → gdal/alg/internal_libqhull/random.c b/gdal/alg/libqhull/random.c → gdal/alg/internal_libqhull/random.c
diff --git a/gdal/alg/libqhull/random.h → gdal/alg/internal_libqhull/random.h b/gdal/alg/libqhull/random.h → gdal/alg/internal_libqhull/random.h
diff --git a/gdal/alg/libqhull/rboxlib.c → gdal/alg/internal_libqhull/rboxlib.c b/gdal/alg/libqhull/rboxlib.c → gdal/alg/internal_libqhull/rboxlib.c
diff --git a/gdal/alg/libqhull/stat.c → gdal/alg/internal_libqhull/stat.c b/gdal/alg/libqhull/stat.c → gdal/alg/internal_libqhull/stat.c
diff --git a/gdal/alg/libqhull/stat.h → gdal/alg/internal_libqhull/stat.h b/gdal/alg/libqhull/stat.h → gdal/alg/internal_libqhull/stat.h
diff --git a/gdal/alg/libqhull/user.c → gdal/alg/internal_libqhull/user.c b/gdal/alg/libqhull/user.c → gdal/alg/internal_libqhull/user.c
diff --git a/gdal/alg/libqhull/user.h → gdal/alg/internal_libqhull/user.h b/gdal/alg/libqhull/user.h → gdal/alg/internal_libqhull/user.h
diff --git a/gdal/alg/libqhull/usermem.c → gdal/alg/internal_libqhull/usermem.c b/gdal/alg/libqhull/usermem.c → gdal/alg/internal_libqhull/usermem.c
diff --git a/gdal/alg/libqhull/userprintf.c → gdal/alg/internal_libqhull/userprintf.c b/gdal/alg/libqhull/userprintf.c → gdal/alg/internal_libqhull/userprintf.c
diff --git a/gdal/alg/libqhull/userprintf_rbox.c → gdal/alg/internal_libqhull/userprintf_rbox.c b/gdal/alg/libqhull/userprintf_rbox.c → gdal/alg/internal_libqhull/userprintf_rbox.c
diff --git a/gdal/alg/internal_qhull_headers.h b/gdal/alg/internal_qhull_headers.h
@@ -974,22 +974,22 @@ static gdal_realT qh_stddev();
 #pragma warning( disable : 4306 )  /* e.g 'type cast' : conversion from 'long' to 'facetT *' of greater size */
 #endif
 
-#include "libqhull/libqhull.h"
-#include "libqhull/libqhull.c"
-#include "libqhull/poly.c"
-#include "libqhull/poly2.c"
-#include "libqhull/mem.c"
-#include "libqhull/user.c"
-#include "libqhull/global.c"
+#include "internal_libqhull/libqhull.h"
+#include "internal_libqhull/libqhull.c"
+#include "internal_libqhull/poly.c"
+#include "internal_libqhull/poly2.c"
+#include "internal_libqhull/mem.c"
+#include "internal_libqhull/user.c"
+#include "internal_libqhull/global.c"
 /*#include "userprintf.c"*/
-#include "libqhull/random.c"
-#include "libqhull/qset.c"
-#include "libqhull/io.c"
-#include "libqhull/usermem.c"
-#include "libqhull/geom.c"
-#include "libqhull/geom2.c"
-#include "libqhull/stat.c"
-#include "libqhull/merge.c"
+#include "internal_libqhull/random.c"
+#include "internal_libqhull/qset.c"
+#include "internal_libqhull/io.c"
+#include "internal_libqhull/usermem.c"
+#include "internal_libqhull/geom.c"
+#include "internal_libqhull/geom2.c"
+#include "internal_libqhull/stat.c"
+#include "internal_libqhull/merge.c"
 
 #ifdef _MSC_VER
 #pragma warning( pop )