Apparently icc doesn't always define __ICC, and it's more correct to

check for __INTEL_COMPILER.  Per report from Dirk Tilger.
Not back-patched since I don't fully trust it yet ...