I made a change so that include/setjmp.h is not spuriously brought in for C++. I'm concerned that your change might affect C++ name mangling for existing C++ code using jmp_buf, but I'm not sure whether that is an issue or not. Thanks, Roland