--- a/src/callproc.c	Mon Aug 13 09:05:44 2007 +0200
+++ b/src/callproc.c	Mon Aug 13 09:06:37 2007 +0200
@@ -202,7 +202,7 @@
 
   error_file = Qt;
 
-#ifdef NO_SUBPROCESSES
+#if defined (NO_SUBPROCESSES)
   /* Without asynchronous processes we cannot have BUFFER == 0.  */
   if (nargs >= 3 && !INTP (args[2]))
     error ("Operating system cannot handle asynchronous subprocesses");
@@ -501,7 +501,7 @@
     {
       if (fd[0] >= 0)
 	close (fd[0]);
-#ifdef NO_SUBPROCESSES
+#if defined (NO_SUBPROCESSES)
       /* If Emacs has been built with asynchronous subprocess support,
 	 we don't need to do this, I think because it will then have
 	 the facilities for handling SIGCHLD.  */
@@ -659,7 +659,7 @@
     nice (- emacs_priority);
 #endif
 
-#ifndef NO_SUBPROCESSES
+#if !defined (NO_SUBPROCESSES)
   /* Close Emacs's descriptors that this process should not have.  */
   close_process_descs ();
 #endif /* not NO_SUBPROCESSES */
@@ -871,7 +871,7 @@
       
       if (STRINGP (entry)
 	  && XSTRING_LENGTH (entry) > varlen
-	  && string_byte (XSTRING (entry), varlen) == '='
+	  && XSTRING_BYTE (entry, varlen) == '='
 #ifdef WINDOWSNT
 	  /* NT environment variables are case insensitive.  */
 	  && ! memicmp (XSTRING_DATA (entry), var, varlen)