From 320695d8d38fcbbb82c7ddd2b44c097a24c6068e Mon Sep 17 00:00:00 2001
From: Dave Love <fx@gnu.org>
Date: Fri, 23 Jun 2000 15:41:52 +0000
Subject: (setpgrp): Undefine before defining. (delete_temp_file): Return Qnil
 to avoid warning.

---
 src/callproc.c | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'src/callproc.c')

diff --git a/src/callproc.c b/src/callproc.c
index e852d3de769..16ae6ada73c 100644
--- 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,
-- 
cgit v1.2.3-70-g09d2