... > Okay, can you please split the patch so they can be backported > separately? Then I'll get them landed, etc. Since the header with just the extra #endif is badly broken on C++ isn't it best to ensure they get back-ported together? So one patch is probably better. David - Registered Address Lakeside, Bramley Road, Mount Farm, Milton Keynes, MK1 1PT, UK Registration No: 1397386 (Wales)