miguel.horta/openttd-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master'

Browse Source 
Conflicts:
	src/os/unix/unix.cpp
	src/widgets/dropdown.cpp
This commit is contained in:
Sergii Pylypenko
2014-08-19 19:21:47 +03:00
parent 9916f1e361 f1273275cc
commit 2603e6b5e3
115 changed files with 4741 additions and 2376 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/os/macosx/crashlog_osx.cpp
View File

@@ -33,7 +33,7 @@
#endif
/* printf format specification for 32/64-bit addresses. */
#if __LP64__
#ifdef __LP64__
#define PRINTF_PTR "0x%016lx"
#else
#define PRINTF_PTR "0x%08lx"

16
src/os/macosx/osx_stdafx.h
View File

@@ -46,24 +46,14 @@
#define __STDC_LIMIT_MACROS
#include <stdint.h>
/* We need to include this first as that "depends" on the compiler's setting
* of __LP64__. So before we define __LP64__ so it can be used. */
#include <sys/cdefs.h>
#include <unistd.h>
/* Some gcc versions include assert.h via this header. As this would interfere
* with our own assert redefinition, include this header first. */
#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 3))
# include <debug/debug.h>
#endif
/* __LP64__ only exists in 10.5 and higher */
#if defined(__APPLE__) && !defined(__LP64__)
# define __LP64__ 0
#endif
/* Check for mismatching 'architectures' */
#if !defined(STRGEN) && !defined(SETTINGSGEN) && ((__LP64__ && !defined(_SQ64)) || (!__LP64__ && defined(_SQ64)))
#if !defined(STRGEN) && !defined(SETTINGSGEN) && ((defined(__LP64__) && !defined(_SQ64)) || (!defined(__LP64__) && defined(_SQ64)))
# error "Compiling 64 bits without _SQ64 set! (or vice versa)"
#endif
@@ -99,7 +89,7 @@
/* NSInteger and NSUInteger are part of 10.5 and higher. */
#ifndef NSInteger
#if __LP64__
#ifdef __LP64__
typedef long NSInteger;
typedef unsigned long NSUInteger;
#else
@@ -109,7 +99,7 @@ typedef unsigned int NSUInteger;
#endif /* NSInteger */
#ifndef CGFLOAT_DEFINED
#if __LP64__
#ifdef __LP64__
typedef double CGFloat;
#else
typedef float CGFloat;

4
src/os/unix/unix.cpp
View File

@@ -385,11 +385,11 @@ void OSOpenBrowser(const char *url)
args[8] = NULL;
#else
const char *args[3];
args[0] = "/usr/bin/xdg-open";
args[0] = "xdg-open";
args[1] = url;
args[2] = NULL;
#endif
execv(args[0], const_cast<char * const *>(args));
execvp(args[0], const_cast<char * const *>(args));
DEBUG(misc, 0, "Failed to open url: %s", url);
exit(0);
}