Skip to content

Commit 1b5edc2

Browse files
author
jef
committedNov 13, 2010
apply #2999
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@14580 c8812cc2-4d05-0410-92ff-de0c093fc19c
1 parent d400fa0 commit 1b5edc2

File tree

6 files changed

+2
-6
lines changed

6 files changed

+2
-6
lines changed
 

‎cmake/FindIconv.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ FIND_PATH(ICONV_INCLUDE_DIR iconv.h
2828
)
2929
FIND_PATH(ICONV_INCLUDE_DIR iconv.h)
3030

31-
FIND_LIBRARY(ICONV_LIBRARY NAMES iconv PATHS
31+
FIND_LIBRARY(ICONV_LIBRARY NAMES iconv libiconv PATHS
3232
"$ENV{LIB_DIR}/lib"
3333
$ENV{LIB}
3434
/usr/local/lib

‎src/core/spatialindex/include/Tools.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,6 @@ typedef unsigned __int8 uint8_t;
6060
#ifndef WIN32
6161
#include <sys/resource.h>
6262
#endif
63-
#include <unistd.h>
6463

6564
#if HAVE_PTHREAD_H
6665
#include <pthread.h>

‎src/core/spatialindex/rtree/BulkLoader.cc

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
// mhadji@gmail.com
2121

2222
#include <stdio.h>
23-
#include <unistd.h>
2423
#include <cstring>
2524

2625
#include "../spatialindex/SpatialIndexImpl.h"

‎src/core/spatialindex/storagemanager/DiskStorageManager.cc

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121

2222
#include "../spatialindex/SpatialIndexImpl.h"
2323

24-
#include <unistd.h>
2524
#include <fcntl.h>
2625
#include <sys/types.h>
2726
#include <sys/stat.h>

‎src/core/spatialindex/tools/ExternalSort.cc

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
// mhadji@gmail.com
2121

2222
#include <stdio.h>
23-
#include <unistd.h>
2423

2524
#include <Tools.h>
2625

‎src/core/spatialindex/tools/TemporaryFile.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,11 @@
2020
// mhadji@gmail.com
2121

2222
#include <stdio.h>
23-
#include <unistd.h>
2423

2524
#include <Tools.h>
2625

2726
#ifdef WIN32
27+
#include <io.h>
2828
#include <fcntl.h>
2929
int mkstemp( char* prefix )
3030
{

0 commit comments

Comments
 (0)
Please sign in to comment.