(svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b.

src/debug.h

@@ -3,6 +3,10 @@
 #ifndef DEBUG_H
 #define DEBUG_H
 
+#ifdef __cplusplus
+extern "C" {
+#endif //__cplusplus
+
 /* Debugging messages policy:
  * These should be the severities used for direct DEBUG() calls
  * maximum debugging level should be 10 if really deep, deep
@@ -105,4 +109,8 @@ const char *GetDebugString(void);
 	}\
 }
 
+#ifdef __cplusplus
+}
+#endif //__cplusplus
+
 #endif /* DEBUG_H */