[Bf-blender-cvs] [76be35efb29] master: Cleanup: clang-format
Campbell Barton
noreply at git.blender.org
Sun May 3 05:48:01 CEST 2020
Commit: 76be35efb29d07bb6f04ca4c9e577c33bf4ead4c
Author: Campbell Barton
Date: Sun May 3 13:42:49 2020 +1000
Branches: master
https://developer.blender.org/rB76be35efb29d07bb6f04ca4c9e577c33bf4ead4c
Cleanup: clang-format
===================================================================
M source/blender/blenlib/intern/system.c
M source/creator/creator_signals.c
M tests/gtests/blenkernel/BKE_fcurve_test.cc
===================================================================
diff --git a/source/blender/blenlib/intern/system.c b/source/blender/blenlib/intern/system.c
index f0597b0e9e7..53db49aa59c 100644
--- a/source/blender/blenlib/intern/system.c
+++ b/source/blender/blenlib/intern/system.c
@@ -32,6 +32,7 @@
/* for backtrace and gethostname/GetComputerName */
#if defined(WIN32)
# include <intrin.h>
+
# include "BLI_winstuff.h"
#else
# include <execinfo.h>
diff --git a/source/creator/creator_signals.c b/source/creator/creator_signals.c
index 0ffa374a0ff..dbf947a86fd 100644
--- a/source/creator/creator_signals.c
+++ b/source/creator/creator_signals.c
@@ -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
* where the error happened */
if (ExceptionInfo->ExceptionRecord->ExceptionCode == EXCEPTION_STACK_OVERFLOW) {
- HMODULE mod;
- CHAR modulename[MAX_PATH];
- LPVOID address = ExceptionInfo->ExceptionRecord->ExceptionAddress;
- fprintf(stderr, "Error : EXCEPTION_STACK_OVERFLOW\n");
- fprintf(stderr, "Address : 0x%p\n", address);
- if (GetModuleHandleEx(GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS, address, &mod)) {
- if (GetModuleFileName(mod, modulename, MAX_PATH)) {
- fprintf(stderr, "Module : %s\n", modulename);
- }
+ HMODULE mod;
+ CHAR modulename[MAX_PATH];
+ LPVOID address = ExceptionInfo->ExceptionRecord->ExceptionAddress;
+ fprintf(stderr, "Error : EXCEPTION_STACK_OVERFLOW\n");
+ fprintf(stderr, "Address : 0x%p\n", address);
+ if (GetModuleHandleEx(GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS, address, &mod)) {
+ if (GetModuleFileName(mod, modulename, MAX_PATH)) {
+ fprintf(stderr, "Module : %s\n", modulename);
}
+ }
}
else {
BLI_windows_handle_exception(ExceptionInfo);
diff --git a/tests/gtests/blenkernel/BKE_fcurve_test.cc b/tests/gtests/blenkernel/BKE_fcurve_test.cc
index 82622f961b6..d28c5075bd8 100644
--- a/tests/gtests/blenkernel/BKE_fcurve_test.cc
+++ b/tests/gtests/blenkernel/BKE_fcurve_test.cc
@@ -16,6 +16,7 @@
* The Original Code is Copyright (C) 2020 by Blender Foundation.
*/
#include "testing/testing.h"
+
#include "MEM_guardedalloc.h"
extern "C" {
More information about the Bf-blender-cvs
mailing list