# HG changeset patch # User Dario Sestito # Date 1276613902 -3600 # Node ID 14a7fd136e43556bdcd05cedecbf2cd3e33a2aed # Parent c1ae5b4952fc17ef575e227068cec738ea81d3b4 Fix _FOFF related error. See bug 2969 diff -r c1ae5b4952fc -r 14a7fd136e43 networksecurity/ipsec/ipsec6/src/sadb.cpp --- a/networksecurity/ipsec/ipsec6/src/sadb.cpp Tue Jun 15 12:21:13 2010 +0100 +++ b/networksecurity/ipsec/ipsec6/src/sadb.cpp Tue Jun 15 15:58:22 2010 +0100 @@ -26,9 +26,9 @@ // This ungainly manoevure is forced on us because the offset is not evaluated early enough by GCC3.4 to be // passed as a template parameter -#if defined(__X86GCC__) || defined(__GCCE__) +#if defined(__X86GCC__) #define KSecurityAssocTimeoutOffset 256 -__ASSERT_COMPILE(KSecurityAssocTimeoutOffset == _FOFF_DYNAMIC(CSecurityAssoc, iTimeout)); +__ASSERT_COMPILE(KSecurityAssocTimeoutOffset == _FOFF(CSecurityAssoc, iTimeout)); #else #define KSecurityAssocTimeoutOffset _FOFF(CSecurityAssoc, iTimeout) #endif