qgis-win.patch

remove unnecessary unistd.h includes and look for libiconv - orgads -, 2010-09-14 08:28 AM

Download (2.54 KB)

View differences:

new/cmake/FindIconv.cmake 2010-09-14 16:36:14.384428396 +0200
27 27 
  )
28 28 
FIND_PATH(ICONV_INCLUDE_DIR iconv.h)
29 29 

  		




  30
  
  
    
FIND_LIBRARY(ICONV_LIBRARY NAMES iconv PATHS

  		




  
  30
  
    
FIND_LIBRARY(ICONV_LIBRARY NAMES iconv libiconv PATHS

  		




  31
  31
  
    
  "$ENV{LIB_DIR}/lib"

  		




  32
  32
  
    
  /usr/local/lib

  		




  33
  33
  
    
  /usr/lib

  		












  

    
      new/src/core/spatialindex/include/Tools.h	2010-09-14 16:50:53.648423623 +0200
    
  





  60
  60
  
    
#ifndef WIN32

  		




  61
  61
  
    
#include <sys/resource.h>

  		




  62
  62
  
    
#endif

  		




  63
  
  
    
#include <unistd.h>

  		




  64
  63
  
    

  		




  65
  64
  
    
#if HAVE_PTHREAD_H

  		




  66
  65
  
    
#include <pthread.h>

  		












  

    
      new/src/core/spatialindex/rtree/BulkLoader.cc	2010-09-14 16:50:53.480800174 +0200
    
  





  20
  20
  
    
//    [email protected]

  		




  21
  21
  
    

  		




  22
  22
  
    
#include <stdio.h>

  		




  23
  
  
    
#include <unistd.h>

  		




  24
  23
  
    
#include <cstring>

  		




  25
  24
  
    

  		




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

  		












  

    
      new/src/core/spatialindex/storagemanager/DiskStorageManager.cc	2010-09-14 16:50:53.412675315 +0200
    
  





  21
  21
  
    

  		




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

  		




  23
  23
  
    

  		




  24
  
  
    
#include <unistd.h>

  		




  25
  24
  
    
#include <fcntl.h>

  		




  26
  25
  
    
#include <sys/types.h>

  		




  27
  26
  
    
#include <sys/stat.h>

  		












  

    
      new/src/core/spatialindex/tools/ExternalSort.cc	2010-09-14 16:50:53.364674125 +0200
    
  





  20
  20
  
    
//    [email protected]

  		




  21
  21
  
    

  		




  22
  22
  
    
#include <stdio.h>

  		




  23
  
  
    
#include <unistd.h>

  		




  24
  23
  
    

  		




  25
  24
  
    
#include <Tools.h>

  		




  26
  25
  
    

  		












  

    
      new/src/core/spatialindex/tools/TemporaryFile.cc	2010-09-14 16:50:53.376675527 +0200
    
  





  20
  20
  
    
//    [email protected]

  		




  21
  21
  
    

  		




  22
  22
  
    
#include <stdio.h>

  		




  23
  
  
    
#include <unistd.h>

  		




  24
  23
  
    

  		




  25
  24
  
    
#include <Tools.h>

  		




  26
  25
  
    

  		




  27
  26
  
    
#ifdef WIN32

  		




  
  27
  
    
#include <io.h>

  		




  28
  28
  
    
#include <fcntl.h>

  		




  29
  29
  
    
int mkstemp( char* prefix )

  		




  30
  30
  
    
{