diff options
| -rw-r--r-- | texinfo/ChangeLog | 7 | ||||
| -rw-r--r-- | texinfo/info/man.c | 4 | ||||
| -rw-r--r-- | texinfo/makeinfo/makeinfo.c | 4 |
3 files changed, 13 insertions, 2 deletions
diff --git a/texinfo/ChangeLog b/texinfo/ChangeLog index 9556a0c..7b72da2 100644 --- a/texinfo/ChangeLog +++ b/texinfo/ChangeLog @@ -1,3 +1,10 @@ +Wed Oct 15 09:49:57 1997 Richard Henderson <rth@cygnus.com> + + * info/man.c (find_man_formatter): Don't cast getenv(), but provide + a minimal declaration at top level. + + * makeinfo/makeinfo.c: Don't redefine alloca if it is already defined. + Tue Oct 7 16:27:34 1997 Manfred Hollstein <manfred@s-direktnet.de> * aclocal.m4: Substitute INSTALL. diff --git a/texinfo/info/man.c b/texinfo/info/man.c index f278837..603325886 100644 --- a/texinfo/info/man.c +++ b/texinfo/info/man.c @@ -51,6 +51,8 @@ # endif /* !hpux */ #endif /* FD_SET */ +extern char *getenv (); + static char *read_from_fd (); static void clean_manpage (); static NODE *manpage_node_of_file_buffer (); @@ -180,7 +182,7 @@ executable_file_in_path (filename, path) static char * find_man_formatter () { - return (executable_file_in_path ("man", (char *)getenv ("PATH"))); + return (executable_file_in_path ("man", getenv ("PATH"))); } static char *manpage_pagename = (char *)NULL; diff --git a/texinfo/makeinfo/makeinfo.c b/texinfo/makeinfo/makeinfo.c index fddc6d9..2b9e966 100644 --- a/texinfo/makeinfo/makeinfo.c +++ b/texinfo/makeinfo/makeinfo.c @@ -1,5 +1,5 @@ /* Makeinfo -- convert texinfo format files into info files. - $Id: makeinfo.c,v 1.1.1.1 1997/08/21 22:58:07 jason Exp $ + $Id: makeinfo.c,v 1.2 1997/09/03 04:25:24 law Exp $ Copyright (C) 1987, 92, 93, 94, 95, 96 Free Software Foundation, Inc. @@ -105,6 +105,7 @@ int minor_version = 67; #include <sys/file.h> #endif /* HAVE_SYS_FILE_H */ +#if !defined(alloca) #if defined (__GNUC__) #define alloca __builtin_alloca #else @@ -116,6 +117,7 @@ extern char *alloca (); #endif /* !_AIX */ #endif /* !HAVE_ALLOCA_H */ #endif /* !__GNUC__ */ +#endif /* alloca */ void *xmalloc (), *xrealloc (); #if defined (__osf__) |