Move #includes out of extern "C" blocks, make STATIC_ASSERT work in C++.

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9737 4a71c877-e1ca-e34f-864e-861f7616d084

.kdev_include_paths

@@ -1 +1,2 @@
 .
+/usr/include/SDL

lib/exceptionhandler/dumpinfo.h

@@ -21,13 +21,13 @@
 #ifndef __INCLUDED_LIB_EXCEPTIONHANDLER_DUMPINFO_H__
 #define __INCLUDED_LIB_EXCEPTIONHANDLER_DUMPINFO_H__
 
+#include "lib/framework/frame.h"
+
 #if defined(__cplusplus)
 extern "C"
 {
 #endif
 
-#include "lib/framework/frame.h"
-
 #if defined(WZ_OS_WIN)
 typedef HANDLE DumpFileHandle;
 #else

lib/framework/debug.h

@@ -117,8 +117,18 @@ extern bool assertEnabled;
  *
  * \note BUILD_BUG_ON_ZERO from <linux/kernel.h>
  */
+#ifndef __cplusplus
 #define STATIC_ASSERT_EXPR( expr ) \
 	(sizeof(struct { int:-!(expr); }))
+#else //cplusplus
+}
+template<bool> class StaticAssert;
+template<> class StaticAssert<true>{};
+#define STATIC_ASSERT_EXPR(expr) \
+	(sizeof(StaticAssert<(expr)>))
+extern "C"
+{
+#endif //cplusplus
 /**
  * Compile time assert
  * Not to be used in global context!

lib/framework/string_ext.h

@@ -21,16 +21,15 @@
 #ifndef STRING_EXT_H
 #define STRING_EXT_H
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 #include "frame.h"
 #include "debug.h"
 #include <string.h>
 #include <stddef.h>
 #include <assert.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
 
 /*!
  * Safe variant of strlen.