sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-04-15 00:04:00 -04:00
Code Issues Packages Projects Releases Wiki Activity

apply #2999

Browse Source 
git-svn-id: http://svn.osgeo.org/qgis/trunk@14580 c8812cc2-4d05-0410-92ff-de0c093fc19c
This commit is contained in:
jef 2010-11-13 10:05:11 +00:00
parent 295ab1b982
commit 0880c2c71d
6 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmake/FindIconv.cmake
View File

@ -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

1
src/core/spatialindex/include/Tools.h
View File

@ -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>

1
src/core/spatialindex/rtree/BulkLoader.cc
View File

@ -20,7 +20,6 @@
// mhadji@gmail.com
#include <stdio.h>
#include <unistd.h>
#include <cstring>
#include "../spatialindex/SpatialIndexImpl.h"

1
src/core/spatialindex/storagemanager/DiskStorageManager.cc
View File

@ -21,7 +21,6 @@
#include "../spatialindex/SpatialIndexImpl.h"
#include <unistd.h>
#include <fcntl.h>
#include <sys/types.h>
#include <sys/stat.h>

1
src/core/spatialindex/tools/ExternalSort.cc
View File

@ -20,7 +20,6 @@
// mhadji@gmail.com
#include <stdio.h>
#include <unistd.h>
#include <Tools.h>

2
src/core/spatialindex/tools/TemporaryFile.cc
View File

@ -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 )
{