gcc3 and gcc4 disagree, so put a common cast to make them compile.

(also compile some file with -O1 in moz)
This commit is contained in:
espie 2010-05-10 12:36:09 +00:00
parent ca04622d59
commit 8666776b2e
6 changed files with 146 additions and 20 deletions

View File

@ -1,6 +1,6 @@
$OpenBSD: patch-accessible_src_atk_nsAppRootAccessible_cpp,v 1.2 2010/04/24 16:08:01 landry Exp $
--- accessible/src/atk/nsAppRootAccessible.cpp.orig Thu Oct 11 13:13:32 2007
+++ accessible/src/atk/nsAppRootAccessible.cpp Fri Jun 13 19:31:10 2008
$OpenBSD: patch-accessible_src_atk_nsAppRootAccessible_cpp,v 1.3 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;
@ -10,3 +10,28 @@ $OpenBSD: patch-accessible_src_atk_nsAppRootAccessible_cpp,v 1.2 2010/04/24 16:0
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, :(

View File

@ -1,6 +1,6 @@
$OpenBSD: patch-mozilla_accessible_src_atk_nsAppRootAccessible_cpp,v 1.1 2010/04/03 09:26:46 landry Exp $
--- mozilla/accessible/src/atk/nsAppRootAccessible.cpp.orig Sat Dec 5 02:55:55 2009
+++ mozilla/accessible/src/atk/nsAppRootAccessible.cpp Sat Jan 16 16:28:32 2010
$OpenBSD: patch-mozilla_accessible_src_atk_nsAppRootAccessible_cpp,v 1.2 2010/05/10 12:36:09 espie Exp $
--- mozilla/accessible/src/atk/nsAppRootAccessible.cpp.orig Wed Mar 17 19:32:26 2010
+++ mozilla/accessible/src/atk/nsAppRootAccessible.cpp Mon May 10 09:47:01 2010
@@ -55,7 +55,7 @@ typedef GType (* AtkGetTypeType) (void);
GType g_atk_hyperlink_impl_type = G_TYPE_INVALID;
static PRBool sATKChecked = PR_FALSE;
@ -10,3 +10,28 @@ $OpenBSD: patch-mozilla_accessible_src_atk_nsAppRootAccessible_cpp,v 1.1 2010/04
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, :(

View File

@ -1,6 +1,6 @@
$OpenBSD: patch-accessible_src_atk_nsAppRootAccessible_cpp,v 1.1.1.1 2009/06/21 01:31:24 martynas Exp $
--- accessible/src/atk/nsAppRootAccessible.cpp.orig Thu Oct 11 13:13:32 2007
+++ accessible/src/atk/nsAppRootAccessible.cpp Fri Jun 13 19:31:10 2008
$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;
@ -10,3 +10,28 @@ $OpenBSD: patch-accessible_src_atk_nsAppRootAccessible_cpp,v 1.1.1.1 2009/06/21
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, :(

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-accessible_src_atk_nsAppRootAccessible_cpp,v 1.2 2010/04/26 19:55:58 landry Exp $
--- accessible/src/atk/nsAppRootAccessible.cpp.orig Wed Jan 6 05:35:10 2010
+++ accessible/src/atk/nsAppRootAccessible.cpp Sun Jan 10 17:47:23 2010
@@ -56,7 +56,7 @@ typedef GType (* AtkGetTypeType) (void);
$OpenBSD: patch-accessible_src_atk_nsAppRootAccessible_cpp,v 1.3 2010/05/10 12:36:09 espie Exp $
--- accessible/src/atk/nsAppRootAccessible.cpp.orig Wed Mar 17 19:32:26 2010
+++ accessible/src/atk/nsAppRootAccessible.cpp Mon May 10 09:47:01 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;
@ -10,3 +10,28 @@ $OpenBSD: patch-accessible_src_atk_nsAppRootAccessible_cpp,v 1.2 2010/04/26 19:5
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, :(

View File

@ -1,12 +1,13 @@
$OpenBSD: patch-parser_html_Makefile_in,v 1.1 2010/04/26 19:55:58 landry Exp $
$OpenBSD: patch-parser_html_Makefile_in,v 1.2 2010/05/10 12:36:09 espie Exp $
gcc runs out of memory with optimization.
--- parser/html/Makefile.in.orig Sat Mar 27 20:59:47 2010
+++ parser/html/Makefile.in Sat Mar 27 21:01:04 2010
@@ -98,3 +98,5 @@ include $(topsrcdir)/config/rules.mk
--- parser/html/Makefile.in.orig Fri Apr 2 18:02:56 2010
+++ parser/html/Makefile.in Mon May 10 10:26:38 2010
@@ -98,3 +98,6 @@ include $(topsrcdir)/config/rules.mk
INCLUDES += \
-I$(srcdir)/../../content/base/src \
$(NULL)
+
+nsHtml5NamedCharacters.o: CXXFLAGS := $(filter-out -O%,$(CXXFLAGS))
+nsHtml5ElementName.o: CXXFLAGS := $(CXXFLAGS) -O1

View File

@ -1,6 +1,6 @@
$OpenBSD: patch-mozilla_accessible_src_atk_nsAppRootAccessible_cpp,v 1.1 2010/04/03 09:30:14 landry Exp $
--- mozilla/accessible/src/atk/nsAppRootAccessible.cpp.orig Sat Dec 5 02:55:55 2009
+++ mozilla/accessible/src/atk/nsAppRootAccessible.cpp Sat Jan 16 16:28:32 2010
$OpenBSD: patch-mozilla_accessible_src_atk_nsAppRootAccessible_cpp,v 1.2 2010/05/10 12:36:09 espie Exp $
--- mozilla/accessible/src/atk/nsAppRootAccessible.cpp.orig Wed Mar 17 19:32:26 2010
+++ mozilla/accessible/src/atk/nsAppRootAccessible.cpp Mon May 10 09:47:01 2010
@@ -55,7 +55,7 @@ typedef GType (* AtkGetTypeType) (void);
GType g_atk_hyperlink_impl_type = G_TYPE_INVALID;
static PRBool sATKChecked = PR_FALSE;
@ -10,3 +10,28 @@ $OpenBSD: patch-mozilla_accessible_src_atk_nsAppRootAccessible_cpp,v 1.1 2010/04
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, :(