2 files changed, 6 insertions, 2 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 8ec43816798..7e4a64b63a9 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2008-07-21  Dan Nicolaescu  <dann@ics.uci.edu>
+
+        * m/amdx86-64.h: Use SOLARIS2 instead of sun.
+
 2008-07-21  Chong Yidong  <cyd@stupidchicken.com>
 
         * nsfns.m: Change NS to Nextstep in docstrings and error messages.
diff --git a/src/m/amdx86-64.h b/src/m/amdx86-64.h
index 139cfd1003a..bc3886f3473 100644
--- a/src/m/amdx86-64.h
+++ b/src/m/amdx86-64.h
@@ -101,12 +101,12 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 /* LIB_STANDARD and START_FILES set correctly in s/netbsd.h */
 
-#elif defined(sun)
+#elif defined(SOLARIS2)
 
 #undef START_FILES
 #undef LIB_STANDARD
 
-#else /* !__OpenBSD__ && !__FreeBSD__ && !__NetBSD__ && !sun */
+#else /* !__OpenBSD__ && !__FreeBSD__ && !__NetBSD__ && !SOLARIS2 */
 
 #undef START_FILES
 #ifdef HAVE_LIB64_DIR