update libosmium to v2.6.0

This commit is contained in:
Dane Springmeyer
2016-02-10 13:41:22 -08:00
parent bb06bfbbd7
commit c40375a424
253 changed files with 1431 additions and 28359 deletions
File diff suppressed because it is too large Load Diff
File diff suppressed because it is too large Load Diff
-18
View File
@@ -1,18 +0,0 @@
#include <cstdlib>
#include <string>
inline std::string with_data_dir(const char* filename) {
const char* data_dir = getenv("OSMIUM_TEST_DATA_DIR");
std::string result;
if (data_dir) {
result = data_dir;
result += '/';
}
result += filename;
return result;
}
-42
View File
@@ -1,42 +0,0 @@
/*
* mkstemp.c
*
* Provides a trivial replacement for the POSIX `mkstemp()' function,
* suitable for use in MinGW (Win32) applications.
*
* This file is part of the MinGW32 package set.
*
* Contributed by Keith Marshall <keithmarshall@users.sourceforge.net>
* Patched to VS2013 by alex85k
* THIS SOFTWARE IS NOT COPYRIGHTED
*
* This source code is offered for use in the public domain. You may
* use, modify or distribute it freely.
*
* This code is distributed in the hope that it will be useful but
* WITHOUT ANY WARRANTY. ALL WARRANTIES, EXPRESS OR IMPLIED ARE HEREBY
* DISCLAIMED. This includes but is not limited to warranties of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
*/
#ifndef WIN_MKSTEMP_H
#define WIN_MKSTEMP_H
#include <stdio.h>
#include <fcntl.h>
#include <share.h>
inline int mkstemp( char *templ )
{
int maxtry = 26, rtn = -1;
while( maxtry-- && (rtn < 0) )
{
char *r = _mktemp( templ );
if( r == NULL )
return -1;
rtn = sopen( r, O_RDWR | O_CREAT | O_EXCL | O_BINARY, SH_DENYRW, 0600 );
}
return rtn;
}
#endif