problem building 2.3.1 with TBB on Windows/VS2005 (Bug #1484)

I am trying to build the 2.3.1 release in 32 bit with TBB and IPP (recent versions, downloaded 2 weeks ago) enabled on Visual Studio 2005.

I am getting errors about multiple definitions of 'L1' in flann/dist.h and flann.hpp (among other places), e.g.

1/*
2* Manhattan distance functor, optimized version
3 */
4template<class T>
5struct L1

This seems to conflict with the 'L1' symbol used on line 139 of the windows_ia32.h included with TBB, in the function below:

 1static inline void +TBB_machine_pause (+int32 delay ) {
 2    _asm 
 3    {
 4        mov eax, delay
 5      L1: 
 6        pause
 7        add eax, -1
 8        jne L1
 9    }
10    return;
11}

If I rename the L1 in this header, all projects build fine (ok a lot of warnings, but all errors are gone).

I tried renaming the L1 definition in flann instead, but this seems to break a lot of macros and other things.