github-starred/ultimatepp
2
0
Fork 0
mirror of https://github.com/ultimatepp/ultimatepp.git synced 2026-07-11 22:03:01 -06:00
Code Issues 33 Projects Packages Wiki Activity Actions

bazaar: plugin/gdal fixed for POSIX

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@10902 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
cxl 2017-03-06 11:07:01 +00:00
parent 31d123e5cc
commit 42a3f51f0a
3 changed files with 20 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
bazaar/plugin/gdal/alg/gdaldither.cpp
View file

@ -60,7 +60,7 @@
#include <emmintrin.h>
#define CAST_PCT(x) ((GByte*)x)
#define ALIGN_INT_ARRAY_ON_16_BYTE(x) ( (((GPtrDiff_t)(x) % 16) != 0 ) ? (int*)((GByte*)(x) + 16 - ((GPtrDiff_t)(x) % 16)) : (x) )
#define ALIGN_INT_ARRAY_ON_16_BYTE(x) ( (((GPtrDiff_t)(uintptr_t)(x) % 16) != 0 ) ? (int*)((GByte*)(x) + 16 - ((GPtrDiff_t)(uintptr_t)(x) % 16)) : (x) )
#else

19
bazaar/plugin/gdal/cpl_config.h
View file

@ -1,3 +1,5 @@
#include <Core/config.h> // we want PLATFORM and COMPILER defines
#define CPL_DISABLE_DLL
#define DISABLE_CPLID // ALLOW BLITZ
@ -28,9 +30,11 @@
declare STDCALL interfaces even if an application is built against it
using MinGW */
#ifdef PLATFORM_WIN32
#ifndef CPL_DISABLE_STDCALL
# define CPL_STDCALL __stdcall
#endif
#endif
#define HAVE_LIBZ 1
@ -49,10 +53,13 @@
#endif
#define HAVE_GETCWD 1
#ifndef PLATFORM_POSIX
/* gmt_notunix.h from GMT project also redefines getcwd. See #3138 */
#ifndef getcwd
#define getcwd _getcwd
#endif
#endif
/* Define if you have the ANSI C header files. */
#ifndef STDC_HEADERS
@ -86,7 +93,7 @@
#define HAVE_SEARCH_H 1
/* Define to 1 if you have the <direct.h> header file. */
#define HAVE_DIRECT_H
// #define HAVE_DIRECT_H
/* Define to 1 if you have the `localtime_r' function. */
#undef HAVE_LOCALTIME_R
@ -129,12 +136,12 @@
#define lfind _lfind
#if defined(_MSC_VER) && (_MSC_VER < 1310)
# define VSI_STAT64 _stat
# define VSI_STAT64_T _stat
#ifdef PLATFORM_POSIX
#define VSI_STAT64 stat64
#define VSI_STAT64_T stat64
#else
# define VSI_STAT64 _stat64
# define VSI_STAT64_T __stat64
#define VSI_STAT64 _stat64
#define VSI_STAT64_T __stat64
#endif
/* VC6 doesn't known intptr_t */

6
bazaar/plugin/gdal/import.ext
View file

@ -36,8 +36,14 @@ exclude
*/ods/*
*/gpkg/*
*/osm/*
*/pgeo/*
*/geomedia/*
*/mssqlspatial/*
*/walk/*
*/odbc/*
port/cpl_vsil_simple.cpp
port/cpl_win32ce_api.cpp
port/cpl_odbc.cpp
frmts/bgp/*
frmts/dds/*
frmts/ecw/*