(setpgrp): Undefine before defining.

(delete_temp_file): Return Qnil to avoid warning.

diff --git a/src/callproc.c b/src/callproc.c
index e852d3de769ec8647662a343cd928f115c42d128..16ae6ada73c8c052b56a2e8536957f27ef0f960f 100644 (file)
--- a/src/callproc.c
+++ b/src/callproc.c
@@ -93,6 +93,7 @@ extern char **environ;
 
 #ifdef HAVE_SETPGID
 #if !defined (USG) || defined (BSD_PGRPS)
+#undef setpgrp
 #define setpgrp setpgid
 #endif
 #endif
@@ -879,6 +880,7 @@ delete_temp_file (name)
   /* Use Fdelete_file (indirectly) because that runs a file name handler.
      We did that when writing the file, so we should do so when deleting.  */
   internal_delete_file (name);
+  return Qnil;
 }
 
 DEFUN ("call-process-region", Fcall_process_region, Scall_process_region,