From 829e1aa77ea4670d68934f17276e081172082fdf Mon Sep 17 00:00:00 2001
From: baldurk <baldurk@baldurk.org>
Date: Fri, 28 Apr 2017 19:36:09 +0100
Subject: [PATCH] Fix handling of 'slots' Qt keyword clashing with python

* On linux without any PCH we have a slightly different case to windows
  with the PCH, so we need to be careful not to redefine the macro.
---
 qrenderdoc/Code/pyrenderdoc/PythonContext.cpp | 3 +++
 qrenderdoc/Code/pyrenderdoc/qrenderdoc.i      | 2 ++
 2 files changed, 5 insertions(+)

diff --git a/qrenderdoc/Code/pyrenderdoc/PythonContext.cpp b/qrenderdoc/Code/pyrenderdoc/PythonContext.cpp
index 08c6d762e..3c6886460 100644
--- a/qrenderdoc/Code/pyrenderdoc/PythonContext.cpp
+++ b/qrenderdoc/Code/pyrenderdoc/PythonContext.cpp
@@ -24,13 +24,16 @@
 
 #ifdef slots
 #undef slots
+#define slots_was_defined
 #endif
 
 // must be included first
 #include <Python.h>
 #include <frameobject.h>
 
+#ifdef slots_was_defined
 #define slots
+#endif
 
 #if PYSIDE2_ENABLED
 // PySide Qt integration, must be included before Qt headers
diff --git a/qrenderdoc/Code/pyrenderdoc/qrenderdoc.i b/qrenderdoc/Code/pyrenderdoc/qrenderdoc.i
index ad0a756a4..8d019e33f 100644
--- a/qrenderdoc/Code/pyrenderdoc/qrenderdoc.i
+++ b/qrenderdoc/Code/pyrenderdoc/qrenderdoc.i
@@ -53,7 +53,9 @@ CONTAINER_TYPEMAPS(QMap)
 
   #include "datetime.h"
 
+#ifndef slots
 #define slots
+#endif
 
   #include "Code/Interface/QRDInterface.h"
   #include "Code/pyrenderdoc/PythonContext.h"