diff --git a/src/backend/storage/ipc/s_lock.c b/src/backend/storage/ipc/s_lock.c
index 68cda57674339851e85883a9c71748975a5002c6..1da681701751918a514d156f51f70dd909323ca0 100644
--- a/src/backend/storage/ipc/s_lock.c
+++ b/src/backend/storage/ipc/s_lock.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/storage/ipc/Attic/s_lock.c,v 1.9 1996/12/04 03:06:04 bryanh Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/storage/ipc/Attic/s_lock.c,v 1.10 1997/01/26 20:15:00 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -50,7 +50,7 @@
 
 extern int tas(slock_t *lock);
 
-#if defined (next)
+#if defined (nextstep)
 /*
  * NEXTSTEP (mach)
  * slock_t is defined as a struct mutex.
diff --git a/src/backend/tcop/postgres.c b/src/backend/tcop/postgres.c
index 07bae4af5fe50c7a1f9698efaffa2fab9ef788b4..53554578dc2a3747de83e1480b6a10919b756e42 100644
--- a/src/backend/tcop/postgres.c
+++ b/src/backend/tcop/postgres.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/tcop/postgres.c,v 1.26 1997/01/26 15:30:48 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/tcop/postgres.c,v 1.27 1997/01/26 20:15:06 momjian Exp $
  *
  * NOTES
  *    this is the "main" module of the postgres backend and
@@ -102,13 +102,13 @@ static bool     IsEmptyQuery = false;
 
 char            relname[80];            /* current relation name */
 
-#if defined(WIN32) || defined(next)
+#if defined(WIN32) || defined(nextstep)
 jmp_buf    Warn_restart;
 #define sigsetjmp(x,y)  setjmp(x)
 #define siglongjmp longjmp
 #else
 sigjmp_buf Warn_restart;
-#endif /*defined(WIN32) || defined(next) */
+#endif /*defined(WIN32) || defined(nextstep) */
 int InWarn;
 
 extern int      NBuffers;
@@ -1282,7 +1282,7 @@ PostgresMain(int argc, char *argv[])
      */
     if (IsUnderPostmaster == false) {
         puts("\nPOSTGRES backend interactive interface");
-        puts("$Revision: 1.26 $ $Date: 1997/01/26 15:30:48 $");
+        puts("$Revision: 1.27 $ $Date: 1997/01/26 20:15:06 $");
     }
     
     /* ----------------
diff --git a/src/include/storage/ipc.h b/src/include/storage/ipc.h
index 15e9650ffe8d5c475f40f1a483e5d3a70ece26e0..87ba9898c104df2d85b4ce7898d3a8b61db59fe9 100644
--- a/src/include/storage/ipc.h
+++ b/src/include/storage/ipc.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: ipc.h,v 1.12 1997/01/13 03:54:48 bryanh Exp $
+ * $Id: ipc.h,v 1.13 1997/01/26 20:15:26 momjian Exp $
  *
  * NOTES
  *    This file is very architecture-specific.  This stuff should actually
@@ -35,7 +35,7 @@ extern void S_INIT_LOCK(slock_t *lock);
 #if defined(alpha) || \
     defined(hpux) || \
     defined(irix5) || \
-    defined(next)
+    defined(nextstep)
 extern int S_LOCK_FREE(slock_t *lock);
 #else
 #define S_LOCK_FREE(lock)	((*lock) == 0)