connectivity/source/drivers/mozab/mozillasrc/MLdapAttributeMap.cxx | 4 +- moz/makefile.mk | 1 moz/patches/seamonkey-1.1.14.source-typeof.patch | 18 ++++++++++ 3 files changed, 21 insertions(+), 2 deletions(-)
New commits: commit 437fe5a444411f68d1848c49121394f16f09611b Author: Stephan Bergmann <sberg...@redhat.com> Date: Tue Feb 21 09:31:34 2012 +0100 Work around g++ -std=c++0x rejecting "typeof" keyword diff --git a/moz/makefile.mk b/moz/makefile.mk index 7f926e5..4146f41 100644 --- a/moz/makefile.mk +++ b/moz/makefile.mk @@ -88,6 +88,7 @@ PATCH_FILES = \ patches/nss-linux3.patch \ patches/clang_add_nsCaseInsensitiveStringComparator_default_constructor.patch \ patches/clang_missing_this_pointers.patch \ + patches/seamonkey-1.1.14.source-typeof.patch # This file is needed for the W32 build when BUILD_MOZAB is set # (currently only vc8/vs2005 is supported when BUILD_MOZAB is set) diff --git a/moz/patches/seamonkey-1.1.14.source-typeof.patch b/moz/patches/seamonkey-1.1.14.source-typeof.patch new file mode 100644 index 0000000..632e155 --- /dev/null +++ b/moz/patches/seamonkey-1.1.14.source-typeof.patch @@ -0,0 +1,18 @@ +--- misc/mozilla/xpcom/base/nscore.h 2006-08-24 23:46:32.000000000 +0200 ++++ misc/build/mozilla/xpcom/base/nscore.h 2012-02-21 09:22:51.136057997 +0100 +@@ -211,9 +211,14 @@ + * when http://gcc.gnu.org/bugzilla/show_bug.cgi?id=11893 is fixed. + */ + ++// At least "g++ (GCC) 4.6.2 20111027 (Red Hat 4.6.2-1)" with -std=c++0x no ++// longer recognizes "typeof" as a (GCC extension) keyword (an alternative fix ++// might be to check the GCC version, as the bug mentioned above is reportedly ++// fixed in GCC 4.4.3, see ++// <http://gcc.gnu.org/bugzilla/show_bug.cgi?id=9381#c15>): + #ifdef __GNUC__ + #define NS_STDCALL_FUNCPROTO(ret, name, class, func, args) \ +- typeof(&class::func) name ++ __typeof__(&class::func) name + #else + #define NS_STDCALL_FUNCPROTO(ret, name, class, func, args) \ + ret (NS_STDCALL class::*name) args commit bc19ce46dd313aecf4a74981814c79bc703dd995 Author: Stephan Bergmann <sberg...@redhat.com> Date: Tue Feb 21 09:30:29 2012 +0100 Typo nsResult -> nsresult diff --git a/connectivity/source/drivers/mozab/mozillasrc/MLdapAttributeMap.cxx b/connectivity/source/drivers/mozab/mozillasrc/MLdapAttributeMap.cxx index 4fbb10b..aff3e07 100644 --- a/connectivity/source/drivers/mozab/mozillasrc/MLdapAttributeMap.cxx +++ b/connectivity/source/drivers/mozab/mozillasrc/MLdapAttributeMap.cxx @@ -48,8 +48,8 @@ namespace connectivity { namespace mozab { //==================================================================== namespace { - typedef NS_STDCALL_FUNCPROTO(nsResult, CardPropertyGetter, nsIAbCard, GetFirstName, (PRUnichar**)); - typedef NS_STDCALL_FUNCPROTO(nsResult, CardPropertySetter, nsIAbCard, SetFirstName, (const PRUnichar*)); + typedef NS_STDCALL_FUNCPROTO(nsresult, CardPropertyGetter, nsIAbCard, GetFirstName, (PRUnichar**)); + typedef NS_STDCALL_FUNCPROTO(nsresult, CardPropertySetter, nsIAbCard, SetFirstName, (const PRUnichar*)); struct CardPropertyData { const sal_Char* pLDAPAttributeList; _______________________________________________ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits