[Bf-blender-cvs] [b9833860e56] master: Cleanup: maintain include order without disabling clang format

Campbell Barton noreply at git.blender.org
Fri Mar 5 04:45:59 CET 2021


Commit: b9833860e5652e420d6aafbdce2ae77bafd45055
Author: Campbell Barton
Date:   Fri Mar 5 14:07:06 2021 +1100
Branches: master
https://developer.blender.org/rBb9833860e5652e420d6aafbdce2ae77bafd45055

Cleanup: maintain include order without disabling clang format

===================================================================

M	intern/clog/clog.c

===================================================================

diff --git a/intern/clog/clog.c b/intern/clog/clog.c
index af8bf38d84d..a26ac10a61f 100644
--- a/intern/clog/clog.c
+++ b/intern/clog/clog.c
@@ -38,11 +38,10 @@
 #endif
 
 #if defined(_MSC_VER)
-// clang-format off
 #  include <Windows.h>
+
 #  include <VersionHelpers.h> /* This needs to be included after Windows.h. */
 #  include <io.h>
-// clang-format on
 #  if !defined(ENABLE_VIRTUAL_TERMINAL_PROCESSING)
 #    define ENABLE_VIRTUAL_TERMINAL_PROCESSING 0x0004
 #  endif



More information about the Bf-blender-cvs mailing list