Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDalai Felinto <dalai@blender.org>2020-03-19 11:33:03 +0300
committerDalai Felinto <dalai@blender.org>2020-03-19 11:33:58 +0300
commit2d1cce8331f3ecdfb8cb0c651e111ffac5dc7153 (patch)
treeec50d7bdca3901a6afcc986943011f08f9516307 /intern/atomic
parent008aaaa37841ca27d2bba80d8859336655cef455 (diff)
Cleanup: `make format` after SortedIncludes change
Diffstat (limited to 'intern/atomic')
-rw-r--r--intern/atomic/intern/atomic_ops_msvc.h2
-rw-r--r--intern/atomic/intern/atomic_ops_utils.h4
2 files changed, 3 insertions, 3 deletions
diff --git a/intern/atomic/intern/atomic_ops_msvc.h b/intern/atomic/intern/atomic_ops_msvc.h
index d9655defa81..9c68d74995d 100644
--- a/intern/atomic/intern/atomic_ops_msvc.h
+++ b/intern/atomic/intern/atomic_ops_msvc.h
@@ -37,8 +37,8 @@
#endif
#define WIN32_LEAN_AND_MEAN
-#include <windows.h>
#include <intrin.h>
+#include <windows.h>
#if defined(__clang__)
# pragma GCC diagnostic push
diff --git a/intern/atomic/intern/atomic_ops_utils.h b/intern/atomic/intern/atomic_ops_utils.h
index b54e12eb49d..57e5b74dd72 100644
--- a/intern/atomic/intern/atomic_ops_utils.h
+++ b/intern/atomic/intern/atomic_ops_utils.h
@@ -47,10 +47,10 @@
#ifndef __ATOMIC_OPS_UTILS_H__
#define __ATOMIC_OPS_UTILS_H__
-#include <stdint.h>
+#include <limits.h>
#include <stddef.h>
+#include <stdint.h>
#include <stdlib.h>
-#include <limits.h>
#include <assert.h>