From 6f36e1f872a61c36cc5242d20476886c3061fa3f Mon Sep 17 00:00:00 2001
From: Sergey Sharybin <sergey.vfx@gmail.com>
Date: Fri, 12 Jun 2015 17:32:09 +0500
Subject: Fix compilation error on Windows

The issue was caused by conflicting declaration of HKEY
happening in our WM code and somewhere deeper in atomic
operations headers hierarchy.
---
 source/blender/compositor/intern/COM_ExecutionGroup.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'source/blender/compositor')

diff --git a/source/blender/compositor/intern/COM_ExecutionGroup.cpp b/source/blender/compositor/intern/COM_ExecutionGroup.cpp
index a7f45ffdf81..025ed76907d 100644
--- a/source/blender/compositor/intern/COM_ExecutionGroup.cpp
+++ b/source/blender/compositor/intern/COM_ExecutionGroup.cpp
@@ -25,6 +25,8 @@
 #include <sstream>
 #include <stdlib.h>
 
+#include "atomic_ops.h"
+
 #include "COM_ExecutionGroup.h"
 #include "COM_defines.h"
 #include "COM_ExecutionSystem.h"
@@ -44,8 +46,6 @@
 #include "WM_api.h"
 #include "WM_types.h"
 
-#include "atomic_ops.h"
-
 ExecutionGroup::ExecutionGroup()
 {
 	this->m_isOutput = false;
-- 
cgit v1.2.3