openbsd-ports/www/firefox35/patches/patch-accessible_src_atk_nsAppRootAccessible_cpp
espie 8666776b2e gcc3 and gcc4 disagree, so put a common cast to make them compile.
(also compile some file with -O1 in moz)
2010-05-10 12:36:09 +00:00

38 lines
1.7 KiB
Plaintext

$OpenBSD: patch-accessible_src_atk_nsAppRootAccessible_cpp,v 1.2 2010/05/10 12:36:09 espie Exp $
--- accessible/src/atk/nsAppRootAccessible.cpp.orig Mon Mar 15 15:53:41 2010
+++ accessible/src/atk/nsAppRootAccessible.cpp Mon May 10 13:10:10 2010
@@ -55,7 +55,7 @@ typedef GType (* AtkGetTypeType) (void);
GType g_atk_hyperlink_impl_type = G_TYPE_INVALID;
static PRBool sATKChecked = PR_FALSE;
static PRLibrary *sATKLib = nsnull;
-static const char sATKLibName[] = "libatk-1.0.so.0";
+static const char sATKLibName[] = "libatk-1.0.so";
static const char sATKHyperlinkImplGetTypeSymbol[] =
"atk_hyperlink_impl_get_type";
static const char sAccEnv [] = "GNOME_ACCESSIBILITY";
@@ -117,8 +117,8 @@ static GHashTable *key_listener_list = NULL;
static guint key_snooper_id = 0;
G_BEGIN_DECLS
-typedef void (*GnomeAccessibilityInit) (void);
-typedef void (*GnomeAccessibilityShutdown) (void);
+typedef void (*GnomeAccessibilityInit) ();
+typedef void (*GnomeAccessibilityShutdown) ();
G_END_DECLS
struct MaiUtil
@@ -757,9 +757,11 @@ LoadGtkModule(GnomeAccessibilityModule& aModule)
}
//we have loaded the library, try to get the function ptrs
- if (!(aModule.init = PR_FindFunctionSymbol(aModule.lib,
+ if (!(aModule.init = (GnomeAccessibilityInit)
+ PR_FindFunctionSymbol(aModule.lib,
aModule.initName)) ||
- !(aModule.shutdown = PR_FindFunctionSymbol(aModule.lib,
+ !(aModule.shutdown = (GnomeAccessibilityShutdown)
+ PR_FindFunctionSymbol(aModule.lib,
aModule.shutdownName))) {
//fail, :(