Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
apply #2999
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@14580 c8812cc2-4d05-0410-92ff-de0c093fc19c
  • Loading branch information
jef committed Nov 13, 2010
1 parent d400fa0 commit 1b5edc2
Show file tree
Hide file tree
Showing 6 changed files with 2 additions and 6 deletions.
2 changes: 1 addition & 1 deletion cmake/FindIconv.cmake
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion src/core/spatialindex/include/Tools.h
Expand Up @@ -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>
Expand Down
1 change: 0 additions & 1 deletion src/core/spatialindex/rtree/BulkLoader.cc
Expand Up @@ -20,7 +20,6 @@
// mhadji@gmail.com

#include <stdio.h>
#include <unistd.h>
#include <cstring>

#include "../spatialindex/SpatialIndexImpl.h"
Expand Down
1 change: 0 additions & 1 deletion src/core/spatialindex/storagemanager/DiskStorageManager.cc
Expand Up @@ -21,7 +21,6 @@

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

#include <unistd.h>
#include <fcntl.h>
#include <sys/types.h>
#include <sys/stat.h>
Expand Down
1 change: 0 additions & 1 deletion src/core/spatialindex/tools/ExternalSort.cc
Expand Up @@ -20,7 +20,6 @@
// mhadji@gmail.com

#include <stdio.h>
#include <unistd.h>

#include <Tools.h>

Expand Down
2 changes: 1 addition & 1 deletion src/core/spatialindex/tools/TemporaryFile.cc
Expand Up @@ -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 )
{
Expand Down

0 comments on commit 1b5edc2

Please sign in to comment.