Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Cleanup: clang-format

Browse Source
This commit is contained in:
Campbell Barton
2020-05-03 13:42:49 +10:00
parent b64fdbfb98
commit 76be35efb2
3 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
source/blender/blenlib/intern/system.c
View File

@@ -32,6 +32,7 @@
/* for backtrace and gethostname/GetComputerName */ /* for backtrace and gethostname/GetComputerName */
#if defined(WIN32) #if defined(WIN32)
# include <intrin.h> # include <intrin.h>
# include "BLI_winstuff.h" # include "BLI_winstuff.h"
#else #else
# include <execinfo.h> # include <execinfo.h>

18
source/creator/creator_signals.c
View File

@@ -195,16 +195,16 @@ extern LONG WINAPI windows_exception_handler(EXCEPTION_POINTERS *ExceptionInfo)
/* If this is a stack overflow then we can't walk the stack, so just try to show /* If this is a stack overflow then we can't walk the stack, so just try to show
* where the error happened */ * where the error happened */
if (ExceptionInfo->ExceptionRecord->ExceptionCode == EXCEPTION_STACK_OVERFLOW) { if (ExceptionInfo->ExceptionRecord->ExceptionCode == EXCEPTION_STACK_OVERFLOW) {
HMODULE mod; HMODULE mod;
CHAR modulename[MAX_PATH]; CHAR modulename[MAX_PATH];
LPVOID address = ExceptionInfo->ExceptionRecord->ExceptionAddress; LPVOID address = ExceptionInfo->ExceptionRecord->ExceptionAddress;
fprintf(stderr, "Error : EXCEPTION_STACK_OVERFLOW\n"); fprintf(stderr, "Error : EXCEPTION_STACK_OVERFLOW\n");
fprintf(stderr, "Address : 0x%p\n", address); fprintf(stderr, "Address : 0x%p\n", address);
if (GetModuleHandleEx(GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS, address, &mod)) { if (GetModuleHandleEx(GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS, address, &mod)) {
if (GetModuleFileName(mod, modulename, MAX_PATH)) { if (GetModuleFileName(mod, modulename, MAX_PATH)) {
fprintf(stderr, "Module : %s\n", modulename); fprintf(stderr, "Module : %s\n", modulename);
}
} }
}
} }
else { else {
BLI_windows_handle_exception(ExceptionInfo); BLI_windows_handle_exception(ExceptionInfo);

1
tests/gtests/blenkernel/BKE_fcurve_test.cc
View File

@@ -16,6 +16,7 @@
* The Original Code is Copyright (C) 2020 by Blender Foundation. * The Original Code is Copyright (C) 2020 by Blender Foundation.
*/ */
#include "testing/testing.h" #include "testing/testing.h"
#include "MEM_guardedalloc.h" #include "MEM_guardedalloc.h"
extern "C" { extern "C" {