This break the build of 1.3.x on Solaris 7. ASST is believed to consider this problem critical. In addition: 1) We seem to have compiler and CPU tests in get-addrinfo.h. That's wrong; use a feature test macro even if the only way of setting the feature test macro you know is based on cpu and compiler. The separation serves as documentation and abstraction and is useful for porting. 2) || 1 is bad form in committed code. If it really is what you always want, then remove the other fork of the preprocessor macro. 3) IT seems that we got a thread related pull up to the 1.3.x branch based on this.