aboutsummaryrefslogtreecommitdiff
path: root/texinfo/info
diff options
context:
space:
mode:
authorJeff Law <law@cygnus.com>1998-03-22 22:35:21 +0000
committerJeff Law <law@cygnus.com>1998-03-22 22:35:21 +0000
commit6d8c878f9451b10f660a977b9bfdf43a452a9d4c (patch)
treeb7cee5292ee53741f0bc31e22fd7b26155c2854a /texinfo/info
parentae02b84d36e25ea8bb68163a57cee425f933ba04 (diff)
More merge stuff.
git-svn-id: https://gcc.gnu.org/svn/gcc/trunk@18769 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'texinfo/info')
-rw-r--r--texinfo/info/man.c10
1 files changed, 2 insertions, 8 deletions
diff --git a/texinfo/info/man.c b/texinfo/info/man.c
index d57b0d30719..f200d12e3c7 100644
--- a/texinfo/info/man.c
+++ b/texinfo/info/man.c
@@ -1,5 +1,5 @@
/* man.c: How to read and format man files.
- $Id: man.c,v 1.4 1998/03/22 21:47:54 law Exp $
+ $Id: man.c,v 1.5 1998/03/22 22:35:19 law Exp $
Copyright (C) 1995, 97 Free Software Foundation, Inc.
@@ -32,10 +32,6 @@
#include "tilde.h"
#include "man.h"
-#if !defined (SIGCHLD) && defined (SIGCLD)
-#define SIGCHLD SIGCLD
-#endif
-
#if !defined (_POSIX_VERSION)
#define pid_t int
#endif
@@ -48,8 +44,6 @@
# endif /* !hpux */
#endif /* FD_SET */
-extern char *getenv ();
-
static char *read_from_fd ();
static void clean_manpage ();
static NODE *manpage_node_of_file_buffer ();
@@ -175,7 +169,7 @@ executable_file_in_path (filename, path)
static char *
find_man_formatter ()
{
- return (executable_file_in_path ("man", getenv ("PATH")));
+ return (executable_file_in_path ("man", (char *)getenv ("PATH")));
}
static char *manpage_pagename = (char *)NULL;