aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog13
-rwxr-xr-xconfigure5
-rw-r--r--etc.c4
-rw-r--r--image.c4
-rw-r--r--search.c4
-rw-r--r--url.c4
6 files changed, 22 insertions, 12 deletions
diff --git a/ChangeLog b/ChangeLog
index 623a986..2aa847d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2002-03-06 Christian Weisgerber <w3m-dev-en@mips.inka.de>
+
+ * [w3m-dev-en 00699]
+ * configure: define SETPGRP() instead of setpgrp()
+ * etc.c (mySystem): use SETPGRP() instead of setpgrp()
+ * image.c (openImgdisplay): ditto
+ * search.c (open_migemo): ditto
+ * url.c: revert changes by Dai Sato on 2002-02-01
+ since stdio.h and config.h is included with this order
+ in fm.h
+
2002-03-06 Fumitoshi UKAI <ukai@debian.or.jp>
* version.c.in: 0.3+cvs
@@ -3052,4 +3063,4 @@
* release-0-2-1
* import w3m-0.2.1
-$Id: ChangeLog,v 1.333 2002/03/05 18:10:49 ukai Exp $
+$Id: ChangeLog,v 1.334 2002/03/06 03:32:10 ukai Exp $
diff --git a/configure b/configure
index 61bc2fb..ce072f0 100755
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
#!/bin/sh
-# $Id: configure,v 1.62 2002/02/12 08:52:58 ukai Exp $
+# $Id: configure,v 1.63 2002/03/06 03:32:10 ukai Exp $
# Configuration.
#
@@ -1795,6 +1795,7 @@ if $cc $cflags -o _zmachdep _zmachdep.c > /dev/null 2>&1
then
echo "You have setpgrp()."
def_have_setpgrp='#define HAVE_SETPGRP'
+ def_setpgrp='#define SETPGRP() setpgrp()'
else
cat > _zmachdep.c << EOF
#include <unistd.h>
@@ -1808,7 +1809,7 @@ EOF
then
echo "You have setpgrp( pid, pgrp )."
def_have_setpgrp='#define HAVE_SETPGRP'
- def_setpgrp='#define setpgrp() setpgrp( 0, 0 )'
+ def_setpgrp='#define SETPGRP() setpgrp( 0, 0 )'
else
def_have_setpgrp=''
fi
diff --git a/etc.c b/etc.c
index cd1db2d..736ea06 100644
--- a/etc.c
+++ b/etc.c
@@ -1,4 +1,4 @@
-/* $Id: etc.c,v 1.19 2002/02/19 15:50:18 ukai Exp $ */
+/* $Id: etc.c,v 1.20 2002/03/06 03:32:11 ukai Exp $ */
#include "fm.h"
#include <pwd.h>
#include "myctype.h"
@@ -1075,7 +1075,7 @@ mySystem(char *command, int background)
flush_tty();
if ((pid = fork()) == 0) {
reset_signals();
- setpgrp();
+ SETPGRP();
close_tty();
fclose(stdout);
fclose(stderr);
diff --git a/image.c b/image.c
index c184b6a..00fe158 100644
--- a/image.c
+++ b/image.c
@@ -1,4 +1,4 @@
-/* $Id: image.c,v 1.7 2002/02/14 03:50:03 ukai Exp $ */
+/* $Id: image.c,v 1.8 2002/03/06 03:32:11 ukai Exp $ */
#include "fm.h"
#include <sys/types.h>
@@ -106,7 +106,7 @@ openImgdisplay()
reset_signals();
signal(SIGINT, SIG_IGN);
#ifdef HAVE_SETPGRP
- setpgrp();
+ SETPGRP();
#endif
close_tty();
close(fdr[0]);
diff --git a/search.c b/search.c
index 1e5ce0b..6b34c49 100644
--- a/search.c
+++ b/search.c
@@ -1,4 +1,4 @@
-/* $Id: search.c,v 1.18 2002/01/31 03:55:35 ukai Exp $ */
+/* $Id: search.c,v 1.19 2002/03/06 03:32:11 ukai Exp $ */
#include "fm.h"
#include "regex.h"
#include <signal.h>
@@ -52,7 +52,7 @@ open_migemo(char *migemo_command)
/* child */
reset_signals();
#ifdef HAVE_SETPGRP
- setpgrp();
+ SETPGRP();
#endif
close_tty();
close(fdr[0]);
diff --git a/url.c b/url.c
index 37a7b07..2c8058e 100644
--- a/url.c
+++ b/url.c
@@ -1,6 +1,4 @@
-/* $Id: url.c,v 1.46 2002/02/28 16:15:42 ukai Exp $ */
-#include <stdio.h>
-#include "config.h"
+/* $Id: url.c,v 1.47 2002/03/06 03:32:11 ukai Exp $ */
#include "fm.h"
#include <sys/types.h>
#include <sys/socket.h>