1 files changed, 5 insertions, 17 deletions

diff --git a/src/lisp.h b/src/lisp.h
index 8ba14163f6..1cbdd6efc9 100644
--- a/src/lisp.h
+++ b/src/lisp.h
@@ -509,14 +509,14 @@ typedef unsigned char UCHAR;
 #ifdef NULL
 #undef NULL
 #endif
-#define NULL(x)  (XFASTINT (x) == XFASTINT (Qnil))
+#define NILP(x)  (XFASTINT (x) == XFASTINT (Qnil))
 
 /* #define LISTP(x) (XTYPE ((x)) == Lisp_Cons)*/
 #define CONSP(x) (XTYPE ((x)) == Lisp_Cons)
 #define EQ(x, y) (XFASTINT (x) == XFASTINT (y))
 
 #define CHECK_LIST(x, i) \
-  { if ((XTYPE ((x)) != Lisp_Cons) && !NULL (x)) x = wrong_type_argument (Qlistp, (x)); }
+  { if ((XTYPE ((x)) != Lisp_Cons) && !NILP (x)) x = wrong_type_argument (Qlistp, (x)); }
 
 #define CHECK_STRING(x, i) \
   { if (XTYPE ((x)) != Lisp_String) x = wrong_type_argument (Qstringp, (x)); }
@@ -698,12 +698,12 @@ extern char *stack_bottom;
 /* Check quit-flag and quit if it is non-nil. */
 
 #define QUIT \
-  if (!NULL (Vquit_flag) && NULL (Vinhibit_quit)) \
+  if (!NILP (Vquit_flag) && NILP (Vinhibit_quit)) \
     { Vquit_flag = Qnil; Fsignal (Qquit, Qnil); }
 
 /* Nonzero if ought to quit now.  */
 
-#define QUITP (!NULL (Vquit_flag) && NULL (Vinhibit_quit))
+#define QUITP (!NILP (Vquit_flag) && NILP (Vinhibit_quit))
 
 /* 1 if CH is upper case.  */
 
@@ -1079,14 +1079,6 @@ extern Lisp_Object Fprocess_status (), Fkill_process ();
 /* defined in callproc.c */
 extern Lisp_Object Vexec_path, Vexec_directory, Vdata_directory;
 
-#ifdef MAINTAIN_ENVIRONMENT
-/* defined in environ.c */
-extern int size_of_current_environ ();
-extern void get_current_environ ();
-/* extern void current_environ (); */
-extern Lisp_Object Fgetenv ();
-#endif /* MAINTAIN_ENVIRONMENT */
-
 /* defined in doc.c */
 extern Lisp_Object Vdoc_file_name;
 extern Lisp_Object Fsubstitute_command_keys ();
@@ -1110,8 +1102,4 @@ extern void debugger ();
 extern char *malloc (), *realloc (), *getenv (), *ctime (), *getwd ();
 extern long *xmalloc (), *xrealloc ();
 
-#ifdef MAINTAIN_ENVIRONMENT
-extern unsigned char *egetenv ();
-#else
-#define egetenv getenv
-#endif
+extern char *egetenv ();