diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2017-11-09 23:36:08 +0100 |
|---|---|---|
| committer | Rémi Verschelde <rverschelde@gmail.com> | 2017-11-09 23:36:08 +0100 |
| commit | ed57f0a0d40e7fa8dde222c48cd5649d3f80008e (patch) | |
| tree | e25a7a5ce877126b8d8bd8f7a1d1b5a782d90ada /core | |
| parent | 9e6f9742f4443b0fdb7593ea1fc1b3a7dd46409c (diff) | |
Remove get_default_video_mode definition on OSX/iOS
It had been missed in d09160a8b67fdc60e8108962c4e9bd4c0bc7f13e and broke compilation
for those platforms.
Took the opportunity to run clang-format on the code base to fix some corner cases
that went through our static tests/were overlooked recently.
Diffstat (limited to 'core')
| -rw-r--r-- | core/math/math_funcs.h | 2 | ||||
| -rw-r--r-- | core/os/os.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/core/math/math_funcs.h b/core/math/math_funcs.h index 7715e5d6e5..d5135fe414 100644 --- a/core/math/math_funcs.h +++ b/core/math/math_funcs.h @@ -271,7 +271,7 @@ public: #elif defined(_MSC_VER) && _MSC_VER < 1800 __asm fld a __asm fistp b - /*#elif defined( __GNUC__ ) && ( defined( __i386__ ) || defined( __x86_64__ ) ) +/*#elif defined( __GNUC__ ) && ( defined( __i386__ ) || defined( __x86_64__ ) ) // use AT&T inline assembly style, document that // we use memory as output (=m) and input (m) __asm__ __volatile__ ( diff --git a/core/os/os.h b/core/os/os.h index 4ac6e81b15..faecdb0e07 100644 --- a/core/os/os.h +++ b/core/os/os.h @@ -1,4 +1,4 @@ -/************************************************************************* / +/*************************************************************************/ /* os.h */ /*************************************************************************/ /* This file is part of: */ |