The TRUE/FALSE bug on MacOS X, revisited

With the source in its current state, I get the following error when building makensis 2.42 on MacOS X Server 10.3.9:

g++ -o build/release/makensis/util.o -c -Wno-non-virtual-dtor -O2 -Wall -I. -Iexehead "-DNSISCALL= __attribute__((__stdcall__))" -D_WIN32_IE=0x0500 /tmp/nsis-2.42-src/Source/util.cpp
In file included from /tmp/nsis-2.42-src/Source/util.cpp:38:
/usr/include/mach-o/dyld.h:74: error: use of enum `DYLD_BOOL' without previous
declaration

Line 74 of /usr/include/mach-o/dyld.h is as follows:

extern enum DYLD_BOOL NSDestroyObjectFileImage( <---- line 74
NSObjectFileImage objectFileImage);

Now, I've reviewed bug #1851365. I suspect that the fix committed for that one didn't help here because this older header file is making use of "enum DYLD_BOOL" for the NSDestroyObjectFileImage() prototype, whereas later versions presumably have changed this to return a straight int. The old fix ("#define ENUM_DYLD_BOOL") inhibits the definition of the DYLD_BOOL enum, which causes the compiler to choke on the use of that enum in the prototype.

Here's the problematic bit, farther up in dyld.h:

#ifndef ENUM_DYLD_BOOL
#define ENUM_DYLD_BOOL
#undef FALSE
#undef TRUE
enum DYLD_BOOL {
FALSE,
TRUE
};
#endif /* ENUM_DYLD_BOOL */

Same as in the newer version. And here is the relevant snippet of Source/util.cpp, as currently in SVN:

#ifdef __APPLE__
namespace Apple { // defines struct section
# define ENUM_DYLD_BOOL // for TRUE/FALSE, bug #1851365
# include <mach-o/dyld.h> // for _NSGetExecutablePath
};
# include <sys/param.h> // for MAXPATHLEN
#endif

The following variation allows compilation to succeed:

#ifdef __APPLE__
namespace Apple { // defines struct section
# include <mach-o/dyld.h> // for _NSGetExecutablePath
};
# define FALSE 0
# define TRUE 1
# include <sys/param.h> // for MAXPATHLEN
#endif

Not a pretty solution, but Apple's idiotic use of "TRUE" and "FALSE" in a system header kind of forces the issue....