diff options
| author | Brecht Van Lommel <brecht@blender.org> | 2020-04-21 13:39:12 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brecht@blender.org> | 2020-04-21 14:16:59 +0300 |
| commit | 5fed9ac9b5885820a6e0845120cd93f7141fdb84 (patch) | |
| tree | b5086f6168d7dbb92616b3e47e30870b0ff1dc93 /source/blender/blenlib | |
| parent | c73d6162be6437a76da94a36502770b440edc454 (diff) | |
Fix clang-format differences between version 6 and 9
Version 6 does not appear to respect clang-format off for header sorting.
Diffstat (limited to 'source/blender/blenlib')
| -rw-r--r-- | source/blender/blenlib/intern/fnmatch.c | 3 | ||||
| -rw-r--r-- | source/blender/blenlib/intern/storage_apple.mm | 4 |
2 files changed, 6 insertions, 1 deletions
diff --git a/source/blender/blenlib/intern/fnmatch.c b/source/blender/blenlib/intern/fnmatch.c index 3df09976972..33fe34e7c24 100644 --- a/source/blender/blenlib/intern/fnmatch.c +++ b/source/blender/blenlib/intern/fnmatch.c @@ -27,8 +27,9 @@ # define _GNU_SOURCE 1 #endif -#include <errno.h> #include <ctype.h> +#include <errno.h> + #include "BLI_fnmatch.h" diff --git a/source/blender/blenlib/intern/storage_apple.mm b/source/blender/blenlib/intern/storage_apple.mm index 0cc246b8d4f..08d2cfdf4a4 100644 --- a/source/blender/blenlib/intern/storage_apple.mm +++ b/source/blender/blenlib/intern/storage_apple.mm @@ -30,7 +30,9 @@ bool BLI_file_alias_target(char targetpath[FILE_MAXDIR], const char *filepath) { + /* clang-format off */ @autoreleasepool { + /* clang-format on */ NSError *error = nil; NSURL *shortcutURL = [[NSURL alloc] initFileURLWithFileSystemRepresentation:filepath isDirectory:NO @@ -64,7 +66,9 @@ eFileAttributes BLI_file_attributes(const char *path) { int ret = 0; + /* clang-format off */ @autoreleasepool { + /* clang-format on */ NSURL *fileURL = [[NSURL alloc] initFileURLWithFileSystemRepresentation:path isDirectory:NO relativeToURL:nil]; |