aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorTom Lane <tgl@sss.pgh.pa.us>2007-08-05 15:11:40 +0000
committerTom Lane <tgl@sss.pgh.pa.us>2007-08-05 15:11:40 +0000
commitc8b7e811f397cd784bfd3f9bb874bb0616c889f6 (patch)
treeb05efdb819b9990a50f9dc618a7f3d1ca2f430a5 /src
parent8d30337566a94b5b66b00d1cdff01ec1203a53a2 (diff)
downloadpostgresql-c8b7e811f397cd784bfd3f9bb874bb0616c889f6.tar.gz
postgresql-c8b7e811f397cd784bfd3f9bb874bb0616c889f6.zip
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 ...
Diffstat (limited to 'src')
-rw-r--r--src/include/storage/s_lock.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/include/storage/s_lock.h b/src/include/storage/s_lock.h
index 6735fdb77a0..a9cbeacc188 100644
--- a/src/include/storage/s_lock.h
+++ b/src/include/storage/s_lock.h
@@ -66,7 +66,7 @@
* Portions Copyright (c) 1996-2007, PostgreSQL Global Development Group
* Portions Copyright (c) 1994, Regents of the University of California
*
- * $PostgreSQL: pgsql/src/include/storage/s_lock.h,v 1.162 2007/07/16 14:02:22 tgl Exp $
+ * $PostgreSQL: pgsql/src/include/storage/s_lock.h,v 1.163 2007/08/05 15:11:40 tgl Exp $
*
*-------------------------------------------------------------------------
*/
@@ -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__.