Rewrote #ifndef #else #endif with the equivalent #ifdef #else #endif.
Rewrote #ifndef #else #endif with the equivalent #ifdef #else #endif.

ekr/nss-old,ekr/nss-old,nmav/nss,nmav/nss,ekr/nss-old,nmav/nss,ekr/nss-old,ekr/nss-old,nmav/nss,ekr/nss-old,nmav/nss,nmav/nss,nmav/nss,ekr/nss-old