Skip to content
Permalink
Browse files

apply #2999

git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@14580 c8812cc2-4d05-0410-92ff-de0c093fc19c
  • Loading branch information
jef
jef committed Nov 13, 2010
1 parent d400fa0 commit 1b5edc25da9e51c5fe1891f08dbc01fa07a009e1
@@ -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
@@ -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>
@@ -20,7 +20,6 @@
// mhadji@gmail.com

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

#include "../spatialindex/SpatialIndexImpl.h"
@@ -21,7 +21,6 @@

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

#include <unistd.h>
#include <fcntl.h>
#include <sys/types.h>
#include <sys/stat.h>
@@ -20,7 +20,6 @@
// mhadji@gmail.com

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

#include <Tools.h>

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

0 comments on commit 1b5edc2

Please sign in to comment.
You can’t perform that action at this time.