BUG #3516: Incomplete #ifdef statement in s_lock.h

The following bug has been logged online:

Bug reference: 3516
Logged by: Dirk Tilger
Email address: dirk(at)miriup(dot)de
PostgreSQL version: 8.2.4
Operating system: Linux with Intel compiler on ia64
Description: Incomplete #ifdef statement in s_lock.h
Details:

I have been compiling postgresql 8.0, 8.1 and 8.2.4 with the Intel compiler
in the past successfully. This time something went wrong and although I
can't tell precisely how I triggered it, I have found a fix.

We have an increasingly complex Makefile that compiles our third-party
applications. While playing with the options of the compiler I must have
activated something that triggered the #error on line 809 in file s_lock.h.

I was able to fix the problem by changing line 81 of s_lock.h to:
| #if defined(__GNUC__) || defined(__INTEL_COMPILER) || defined(__ICC)

The icc 9.1.045 manual page says (reformatted):
-----8<-----
__ICC Value on IA-32 -- 910
Value on EM64T -- 910
Value on Itanium Architecture -- NA

Notes -- Assigned value refers to the compiler (e.g., 800 is 8.00).
Supported for legacy reasons. Use __INTEL_COMPILER instead.
-----8<-----

Best regards,
Dirk Tilger

PS: I'm not subscribed to the bugs list, put me in CC for communication.