*** emacs.c	Fri Jun 12 13:29:25 1992
--- emacs.c.dist	Wed Jun 10 16:50:50 1992
***************
*** 53,63 ****
  #define O_RDWR 2
  #endif
  
- #ifndef S_ISDIR         /* for NeXT */
- #define S_ISDIR(m)      (((m)&S_IFMT) == S_IFDIR)
- #endif
- 
- 
  #define PRIO_PROCESS 0
  
  /* Command line args from shell, as list of strings */
--- 53,58 ----
***************
*** 462,470 ****
    return 0;
  }
  
- #ifdef NeXT
- int malloc_cookie;
- #endif /* NeXT */
  /* ARGSUSED */
  main (argc, argv, envp)
       int argc;
--- 457,462 ----
***************
*** 478,490 ****
    extern char *sys_errlist[];
    extern void malloc_warning ();
  
- #ifdef NeXT
-    /* this helps out unexNeXT.c */
-    if (initialized)
-      if (malloc_jumpstart(malloc_cookie) != 0)
-        printf("malloc jumpstart failed!\n");
- #endif /* NeXT */
- 
  #ifdef ENERGIZE
    /* call static initializers for linked C++ code */
    /* kludge at least until we make a common C version of the hashtable 
--- 470,475 ----
***************
*** 1120,1137 ****
    DEFVAR_BOOL ("noninteractive", &noninteractive1,
      "Non-nil means Emacs is running without interactive terminal.");
  }
- 
- #ifdef NEED_STRDUP
- 
- extern char *
- strdup(s)
-      char *s;
- {
-     char *result = (char*)malloc(strlen(s) + 1);
-     if (result == (char*)0)
-         return (char*)0;
-     strcpy(result, s);
-     return result;
- }
- 
- #endif
--- 1105,1107 ----
*** fns.c	Thu Jun 11 08:57:48 1992
--- fns.c.dist	Thu Jun 11 08:52:21 1992
***************
*** 1505,1525 ****
        nl[0].n_un.n_name = LDAV_SYMBOL;
        nl[1].n_un.n_name = 0;
  #else /* not convex */
- #ifdef NEXT_KERNEL_FILE
-       nl[0].n_un.n_name = LDAV_SYMBOL;
-       nl[1].n_un.n_name = 0;
- #else
        nl[0].n_name = LDAV_SYMBOL;
        nl[1].n_name = 0;
- #endif /* not NEXT_KERNEL_FILE */
  #endif /* not convex */
  #endif /* NLIST_STRUCT */
  
- #ifdef NEXT_KERNEL_FILE
-       nlist (NEXT_KERNEL_FILE, nl);
- #else
        nlist (KERNEL_FILE, nl);
- #endif      /* NEXT_KERNEL_FILE */
  
  #ifdef FIXUP_KERNEL_SYMBOL_ADDR
        FIXUP_KERNEL_SYMBOL_ADDR (nl);
--- 1505,1516 ----
*** lisp.h	Fri Jun 12 13:38:56 1992
--- lisp.h.dist	Wed May 27 21:01:46 1992
***************
*** 1185,1191 ****
  #else
  #define egetenv getenv
  #endif
- 
- #ifdef NEED_STRDUP  /* defined in emacs.c */
- extern char *strdup(char *s);
- #endif
--- 1185,1187 ----
*** sysdep.c	Fri Jun 12 09:33:18 1992
--- sysdep.c.dist	Wed Jun 10 16:51:02 1992
***************
*** 1403,1414 ****
    extern csrt();
    return ((char *) csrt);
  #else /* not GOULD */
- #ifdef NeXT
-   return ((char *)0); /* wrong: but nobody uses it anyway */
- #else
    extern int _start ();
    return ((char *) _start);
- #endif /* NeXT */
  #endif /* GOULD */
  #endif /* TEXT_START */
  }
--- 1403,1410 ----
***************
*** 1466,1478 ****
  #ifdef TEXT_END
    return ((char *) TEXT_END);
  #else
- #ifdef __NeXT__
-   static int etext;
- 
-   etext = get_etext();
- #else
    extern char etext;
- #endif       /* __NeXT__ */
    return ((char *) &etext);
  #endif
  }
--- 1462,1468 ----
***************
*** 1488,1500 ****
  #ifdef DATA_END
    return ((char *) DATA_END);
  #else
- #ifdef __NeXT__
-   static int edata;
- 
-   edata = get_edata();
- #else
    extern int edata;
- #endif                     /* __NeXT__ */
    return ((char *) &edata);
  #endif
  }
--- 1478,1484 ----