|
Lines 1-54
Link Here
|
| 1 |
|
|
|
| 2 |
$FreeBSD: ports/deskutils/google-gadgets/files/patch-ggadget_extension__manager.cc,v 1.1 2008/06/13 14:01:28 pav Exp $ |
| 3 |
|
| 4 |
--- ggadget/extension_manager.cc.orig |
| 5 |
+++ ggadget/extension_manager.cc |
| 6 |
@@ -26,6 +26,12 @@ |
| 7 |
#include "common.h" |
| 8 |
#include "extension_manager.h" |
| 9 |
|
| 10 |
+#if __GNUC__ < 4 |
| 11 |
+#define CAST_HACK(x) (x) |
| 12 |
+#else |
| 13 |
+#define CAST_HACK(x) reinterpret_cast<x> |
| 14 |
+#endif |
| 15 |
+ |
| 16 |
namespace ggadget { |
| 17 |
|
| 18 |
ElementExtensionRegister::ElementExtensionRegister(ElementFactory *factory) |
| 19 |
@@ -35,7 +41,7 @@ |
| 20 |
bool ElementExtensionRegister::RegisterExtension(const Module *extension) { |
| 21 |
ASSERT(extension); |
| 22 |
RegisterElementExtensionFunc func = |
| 23 |
- reinterpret_cast<RegisterElementExtensionFunc>( |
| 24 |
+ CAST_HACK(RegisterElementExtensionFunc)( |
| 25 |
extension->GetSymbol(kElementExtensionSymbolName)); |
| 26 |
|
| 27 |
return func ? func(factory_) : false; |
| 28 |
@@ -48,7 +54,7 @@ |
| 29 |
bool ScriptExtensionRegister::RegisterExtension(const Module *extension) { |
| 30 |
ASSERT(extension); |
| 31 |
RegisterScriptExtensionFunc func = |
| 32 |
- reinterpret_cast<RegisterScriptExtensionFunc>( |
| 33 |
+ CAST_HACK(RegisterScriptExtensionFunc)( |
| 34 |
extension->GetSymbol(kScriptExtensionSymbolName)); |
| 35 |
|
| 36 |
return func ? func(context_) : false; |
| 37 |
@@ -64,7 +70,7 @@ |
| 38 |
bool FrameworkExtensionRegister::RegisterExtension(const Module *extension) { |
| 39 |
ASSERT(extension); |
| 40 |
RegisterFrameworkExtensionFunc func = |
| 41 |
- reinterpret_cast<RegisterFrameworkExtensionFunc>( |
| 42 |
+ CAST_HACK(RegisterFrameworkExtensionFunc)( |
| 43 |
extension->GetSymbol(kFrameworkExtensionSymbolName)); |
| 44 |
|
| 45 |
return func ? func(framework_, gadget_) : false; |
| 46 |
@@ -79,7 +85,7 @@ |
| 47 |
ScriptRuntimeExtensionRegister::RegisterExtension(const Module *extension) { |
| 48 |
ASSERT(extension); |
| 49 |
RegisterScriptRuntimeExtensionFunc func = |
| 50 |
- reinterpret_cast<RegisterScriptRuntimeExtensionFunc>( |
| 51 |
+ CAST_HACK(RegisterScriptRuntimeExtensionFunc)( |
| 52 |
extension->GetSymbol(kScriptRuntimeExtensionSymbolName)); |
| 53 |
|
| 54 |
return func ? func(manager_) : false; |