[QGIS Commit] r14580 - in trunk/qgis: cmake
src/core/spatialindex/include src/core/spatialindex/rtree
src/core/spatialindex/storagemanager src/core/spatialindex/tools
svn_qgis at osgeo.org
svn_qgis at osgeo.org
Sat Nov 13 05:05:19 EST 2010
Author: jef
Date: 2010-11-13 02:05:11 -0800 (Sat, 13 Nov 2010)
New Revision: 14580
Modified:
trunk/qgis/cmake/FindIconv.cmake
trunk/qgis/src/core/spatialindex/include/Tools.h
trunk/qgis/src/core/spatialindex/rtree/BulkLoader.cc
trunk/qgis/src/core/spatialindex/storagemanager/DiskStorageManager.cc
trunk/qgis/src/core/spatialindex/tools/ExternalSort.cc
trunk/qgis/src/core/spatialindex/tools/TemporaryFile.cc
Log:
apply #2999
Modified: trunk/qgis/cmake/FindIconv.cmake
===================================================================
--- trunk/qgis/cmake/FindIconv.cmake 2010-11-13 09:48:31 UTC (rev 14579)
+++ trunk/qgis/cmake/FindIconv.cmake 2010-11-13 10:05:11 UTC (rev 14580)
@@ -28,7 +28,7 @@
)
FIND_PATH(ICONV_INCLUDE_DIR iconv.h)
-FIND_LIBRARY(ICONV_LIBRARY NAMES iconv PATHS
+FIND_LIBRARY(ICONV_LIBRARY NAMES iconv libiconv PATHS
"$ENV{LIB_DIR}/lib"
$ENV{LIB}
/usr/local/lib
Modified: trunk/qgis/src/core/spatialindex/include/Tools.h
===================================================================
--- trunk/qgis/src/core/spatialindex/include/Tools.h 2010-11-13 09:48:31 UTC (rev 14579)
+++ trunk/qgis/src/core/spatialindex/include/Tools.h 2010-11-13 10:05:11 UTC (rev 14580)
@@ -60,7 +60,6 @@
#ifndef WIN32
#include <sys/resource.h>
#endif
-#include <unistd.h>
#if HAVE_PTHREAD_H
#include <pthread.h>
Modified: trunk/qgis/src/core/spatialindex/rtree/BulkLoader.cc
===================================================================
--- trunk/qgis/src/core/spatialindex/rtree/BulkLoader.cc 2010-11-13 09:48:31 UTC (rev 14579)
+++ trunk/qgis/src/core/spatialindex/rtree/BulkLoader.cc 2010-11-13 10:05:11 UTC (rev 14580)
@@ -20,7 +20,6 @@
// mhadji at gmail.com
#include <stdio.h>
-#include <unistd.h>
#include <cstring>
#include "../spatialindex/SpatialIndexImpl.h"
Modified: trunk/qgis/src/core/spatialindex/storagemanager/DiskStorageManager.cc
===================================================================
--- trunk/qgis/src/core/spatialindex/storagemanager/DiskStorageManager.cc 2010-11-13 09:48:31 UTC (rev 14579)
+++ trunk/qgis/src/core/spatialindex/storagemanager/DiskStorageManager.cc 2010-11-13 10:05:11 UTC (rev 14580)
@@ -21,7 +21,6 @@
#include "../spatialindex/SpatialIndexImpl.h"
-#include <unistd.h>
#include <fcntl.h>
#include <sys/types.h>
#include <sys/stat.h>
Modified: trunk/qgis/src/core/spatialindex/tools/ExternalSort.cc
===================================================================
--- trunk/qgis/src/core/spatialindex/tools/ExternalSort.cc 2010-11-13 09:48:31 UTC (rev 14579)
+++ trunk/qgis/src/core/spatialindex/tools/ExternalSort.cc 2010-11-13 10:05:11 UTC (rev 14580)
@@ -20,7 +20,6 @@
// mhadji at gmail.com
#include <stdio.h>
-#include <unistd.h>
#include <Tools.h>
Modified: trunk/qgis/src/core/spatialindex/tools/TemporaryFile.cc
===================================================================
--- trunk/qgis/src/core/spatialindex/tools/TemporaryFile.cc 2010-11-13 09:48:31 UTC (rev 14579)
+++ trunk/qgis/src/core/spatialindex/tools/TemporaryFile.cc 2010-11-13 10:05:11 UTC (rev 14580)
@@ -20,11 +20,11 @@
// mhadji at gmail.com
#include <stdio.h>
-#include <unistd.h>
#include <Tools.h>
#ifdef WIN32
+#include <io.h>
#include <fcntl.h>
int mkstemp( char* prefix )
{
More information about the QGIS-commit
mailing list