From 135ff4cef6e8a9ae834b9e461ea13e11710409f0 Mon Sep 17 00:00:00 2001 From: Xan Lopez Date: Mon, 30 Jul 2007 21:50:44 +0000 Subject: Do not use #ifdef inside macros, ancient compilers don't like it 2007-07-31 Xan Lopez * embed/mozilla/mozilla-embed-single.cpp: * embed/webkit/webkit-embed-single.cpp: Do not use #ifdef inside macros, ancient compilers don't like it svn path=/trunk/; revision=7225 --- embed/webkit/webkit-embed-single.cpp | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) (limited to 'embed/webkit') diff --git a/embed/webkit/webkit-embed-single.cpp b/embed/webkit/webkit-embed-single.cpp index 476aecc11..0946472d3 100644 --- a/embed/webkit/webkit-embed-single.cpp +++ b/embed/webkit/webkit-embed-single.cpp @@ -56,7 +56,10 @@ static void ephy_permission_manager_iface_init (EphyPermissionManagerIface *ifac static void ephy_certificate_manager_iface_init (EphyCertificateManagerIface *iface); #endif +/* Some compilers (like gcc 2.95) don't support preprocessor directives inside macros, + so we have to duplicate the whole thing */ +#ifdef ENABLE_CERTIFICATE_MANAGER G_DEFINE_TYPE_WITH_CODE (WebKitEmbedSingle, webkit_embed_single, G_TYPE_OBJECT, G_IMPLEMENT_INTERFACE (EPHY_TYPE_EMBED_SINGLE, ephy_embed_single_iface_init) @@ -64,12 +67,21 @@ G_DEFINE_TYPE_WITH_CODE (WebKitEmbedSingle, webkit_embed_single, G_TYPE_OBJECT, ephy_cookie_manager_iface_init) G_IMPLEMENT_INTERFACE (EPHY_TYPE_PASSWORD_MANAGER, ephy_password_manager_iface_init) -#ifdef ENABLE_CERTIFICATE_MANAGER G_IMPLEMENT_INTERFACE (EPHY_TYPE_CERTIFICATE_MANAGER, ephy_certificate_manager_iface_init) -#endif G_IMPLEMENT_INTERFACE (EPHY_TYPE_PERMISSION_MANAGER, ephy_permission_manager_iface_init)) +#else +G_DEFINE_TYPE_WITH_CODE (WebKitEmbedSingle, webkit_embed_single, G_TYPE_OBJECT, + G_IMPLEMENT_INTERFACE (EPHY_TYPE_EMBED_SINGLE, + ephy_embed_single_iface_init) + G_IMPLEMENT_INTERFACE (EPHY_TYPE_COOKIE_MANAGER, + ephy_cookie_manager_iface_init) + G_IMPLEMENT_INTERFACE (EPHY_TYPE_PASSWORD_MANAGER, + ephy_password_manager_iface_init) + G_IMPLEMENT_INTERFACE (EPHY_TYPE_PERMISSION_MANAGER, + ephy_permission_manager_iface_init)) +#endif static void -- cgit v1.2.3