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 ...

diff --git a/src/include/storage/s_lock.h b/src/include/storage/s_lock.h
index bf366afde47ef8683b9f7ed96e276f97c1157f0d..54f3fdb8f54ce6592bf1bb3ee1b8c8dbec032ee2 100644 (file)
--- a/src/include/storage/s_lock.h
+++ b/src/include/storage/s_lock.h
@@ -78,7 +78,7 @@
 #ifdef HAVE_SPINLOCKS  /* skip spinlocks if requested */
 
 
-#if defined(__GNUC__) || defined(__ICC)
+#if defined(__GNUC__) || defined(__INTEL_COMPILER)
 /*************************************************************************
  * All the gcc inlines
  * Gcc consistently defines the CPU as __cpu__.