[Bf-blender-cvs] [5cd3212] master: Fix compilation error with stricg GCC flags

Sergey Sharybin noreply at git.blender.org
Wed Jan 15 11:22:32 CET 2014


Commit: 5cd321203eb6cfaaaeb9f00fde2f3e4e161cf09c
Author: Sergey Sharybin
Date:   Wed Jan 15 16:21:53 2014 +0600
https://developer.blender.org/rB5cd321203eb6cfaaaeb9f00fde2f3e4e161cf09c

Fix compilation error with stricg GCC flags

===================================================================

M	intern/cycles/kernel/kernel_sse2.cpp
M	intern/cycles/kernel/kernel_sse3.cpp
M	intern/cycles/kernel/kernel_sse41.cpp

===================================================================

diff --git a/intern/cycles/kernel/kernel_sse2.cpp b/intern/cycles/kernel/kernel_sse2.cpp
index 83f4b19..6f3f171 100644
--- a/intern/cycles/kernel/kernel_sse2.cpp
+++ b/intern/cycles/kernel/kernel_sse2.cpp
@@ -74,6 +74,7 @@ CCL_NAMESPACE_END
 #else
 
 /* needed for some linkers in combination with scons making empty compilation unit in a library */
-void __dummy_function_cycles_sse2(){}
+void __dummy_function_cycles_sse2(void);
+void __dummy_function_cycles_sse2(void){}
 
 #endif
diff --git a/intern/cycles/kernel/kernel_sse3.cpp b/intern/cycles/kernel/kernel_sse3.cpp
index 20c8796..e676098 100644
--- a/intern/cycles/kernel/kernel_sse3.cpp
+++ b/intern/cycles/kernel/kernel_sse3.cpp
@@ -75,6 +75,7 @@ CCL_NAMESPACE_END
 #else
 
 /* needed for some linkers in combination with scons making empty compilation unit in a library */
-void __dummy_function_cycles_sse3(){}
+void __dummy_function_cycles_sse3(void);
+void __dummy_function_cycles_sse3(void){}
 
 #endif
diff --git a/intern/cycles/kernel/kernel_sse41.cpp b/intern/cycles/kernel/kernel_sse41.cpp
index 31294dd..fd2198a 100644
--- a/intern/cycles/kernel/kernel_sse41.cpp
+++ b/intern/cycles/kernel/kernel_sse41.cpp
@@ -76,6 +76,7 @@ CCL_NAMESPACE_END
 #else
 
 /* needed for some linkers in combination with scons making empty compilation unit in a library */
-void __dummy_function_cycles_sse41(){}
+void __dummy_function_cycles_sse41(void);
+void __dummy_function_cycles_sse41(void){}
 
 #endif




More information about the Bf-blender-cvs mailing list