# HG changeset patch
# User Dave Love <fx@gnu.org>
# Date 961774912 0
# Node ID ca781f54ac48a6fec34080d75bb68adf98ca4ac5
# Parent  6ab4cbf4c98a33fd87c4f5f20a3efc393f2f728e
(setpgrp): Undefine before defining.
(delete_temp_file): Return Qnil to avoid warning.

diff -r 6ab4cbf4c98a -r ca781f54ac48 src/callproc.c
--- a/src/callproc.c	Fri Jun 23 15:39:33 2000 +0000
+++ b/src/callproc.c	Fri Jun 23 15:41:52 2000 +0000
@@ -93,6 +93,7 @@
 
 #ifdef HAVE_SETPGID
 #if !defined (USG) || defined (BSD_PGRPS)
+#undef setpgrp
 #define setpgrp setpgid
 #endif
 #endif
@@ -879,6 +880,7 @@
   /* 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,