apply #2999

jef · jef · commit 1b5edc25da9e · 2010-11-13T10:05:11.000Z
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@14580 c8812cc2-4d05-0410-92ff-de0c093fc19c
diff --git a/cmake/FindIconv.cmake b/cmake/FindIconv.cmake
@@ -28,7 +28,7 @@ FIND_PATH(ICONV_INCLUDE_DIR iconv.h
   )
 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
diff --git a/src/core/spatialindex/include/Tools.h b/src/core/spatialindex/include/Tools.h
@@ -60,7 +60,6 @@ typedef unsigned __int8 uint8_t;
 #ifndef WIN32
 #include <sys/resource.h>
 #endif
-#include <unistd.h>
 
 #if HAVE_PTHREAD_H
 #include <pthread.h>
diff --git a/src/core/spatialindex/rtree/BulkLoader.cc b/src/core/spatialindex/rtree/BulkLoader.cc
@@ -20,7 +20,6 @@
 //    mhadji@gmail.com
 
 #include <stdio.h>
-#include <unistd.h>
 #include <cstring>
 
 #include "../spatialindex/SpatialIndexImpl.h"
diff --git a/src/core/spatialindex/storagemanager/DiskStorageManager.cc b/src/core/spatialindex/storagemanager/DiskStorageManager.cc
@@ -21,7 +21,6 @@
 
 #include "../spatialindex/SpatialIndexImpl.h"
 
-#include <unistd.h>
 #include <fcntl.h>
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/src/core/spatialindex/tools/ExternalSort.cc b/src/core/spatialindex/tools/ExternalSort.cc
@@ -20,7 +20,6 @@
 //    mhadji@gmail.com
 
 #include <stdio.h>
-#include <unistd.h>
 
 #include <Tools.h>
 
diff --git a/src/core/spatialindex/tools/TemporaryFile.cc b/src/core/spatialindex/tools/TemporaryFile.cc
@@ -20,11 +20,11 @@
 //    mhadji@gmail.com
 
 #include <stdio.h>
-#include <unistd.h>
 
 #include <Tools.h>
 
 #ifdef WIN32
+#include <io.h>
 #include <fcntl.h>
 int mkstemp( char* prefix )
 {

Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ FIND_PATH(ICONV_INCLUDE_DIR iconv.h`
`28`	`28`	`)`
`29`	`29`	`FIND_PATH(ICONV_INCLUDE_DIR iconv.h)`
`30`	`30`
`31`		`-FIND_LIBRARY(ICONV_LIBRARY NAMES iconv PATHS`
	`31`	`+FIND_LIBRARY(ICONV_LIBRARY NAMES iconv libiconv PATHS`
`32`	`32`	`"$ENV{LIB_DIR}/lib"`
`33`	`33`	`$ENV{LIB}`
`34`	`34`	`/usr/local/lib`