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

2007-01-10 18:56:51 +00:00
parent ce75f6549d
commit a7d0cdf95f
190 changed files with 2825 additions and 2208 deletions
--- a/src/os/macosx/splash.h
+++ b/src/os/macosx/splash.h
@@ -5,6 +5,14 @@

 #define SPLASH_IMAGE_FILE		"splash.png"

-void DisplaySplashImage(void);
+#ifdef __cplusplus
+extern "C" {
+#endif //__cplusplus
+
+	void DisplaySplashImage(void);
+
+#ifdef __cplusplus
+}
+#endif //__cplusplus

 #endif