From d548fe325f8293a9bb444a317e5191a9b639d24e Mon Sep 17 00:00:00 2001
From: Olivier Goffart <olivier.goffart@nokia.com>
Date: Sat, 30 Oct 2010 16:12:22 +0200
Subject: Fix compilation in qglobal.h when included from a .c file

We cannot include c++ header from C files
---
 src/corelib/global/qglobal.h | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/corelib/global/qglobal.h b/src/corelib/global/qglobal.h
index 50f1538..b75a3d8 100644
--- a/src/corelib/global/qglobal.h
+++ b/src/corelib/global/qglobal.h
@@ -43,9 +43,6 @@
 #define QGLOBAL_H
 
 #include <stddef.h>
-#ifndef QT_NO_STL
-#include <algorithm>
-#endif
 
 #define QT_VERSION_STR   "4.8.0"
 /*
@@ -67,6 +64,10 @@
 
 #ifdef __cplusplus
 
+#ifndef QT_NO_STL
+#include <algorithm>
+#endif
+
 #ifndef QT_NAMESPACE /* user namespace */
 
 # define QT_PREPEND_NAMESPACE(name) ::name
-- 
cgit v0.12