diff options
author | Alan Coopersmith <alan.coopersmith@oracle.com> | 2013-01-05 09:25:43 -0800 |
---|---|---|
committer | Alan Coopersmith <alan.coopersmith@oracle.com> | 2013-01-05 09:47:01 -0800 |
commit | 1b5e7ee6483415d7093f3d5395c4832fa69f0a28 (patch) | |
tree | 6cc874d23d75ad454e40affae69a0fd04c57831e /main.c | |
parent | 4db1a4f15ef704b6b6faf1741054d59cb527298a (diff) |
Remove fallbacks for Imake configuration, assume autoconf
For the original 6.9/7.0 release, we supported using either autoconf or
imake to generate configuration. For releases after that, we're only
supporting autoconf, so no longer need to check & fall back to imake.
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Diffstat (limited to 'main.c')
-rw-r--r-- | main.c | 31 |
1 files changed, 3 insertions, 28 deletions
@@ -113,16 +113,7 @@ boolean warn_multiple = FALSE; static void setfile_cmdinc(struct filepointer *filep, long count, char **list); static void redirect(const char *line, const char *makefile); -static -#ifdef RETSIGTYPE -RETSIGTYPE -#else -# ifdef SIGNALRETURNSINT -int -# else -void -# endif -#endif +static RETSIGTYPE catch (int sig) { fflush (stdout); @@ -143,12 +134,6 @@ catch (int sig) static struct sigaction sig_act; #endif /* USGISH */ -#ifndef USING_AUTOCONF -# if !defined(USGISH) && !defined(_SEQUENT_) && !defined(MINIX) -# define HAVE_FCHMOD 1 -# endif -#endif - int main(int argc, char *argv[]) { @@ -712,17 +697,7 @@ char *base_name(const char *in_file) return(file); } -#ifdef USING_AUTOCONF -# ifndef HAVE_RENAME -# define NEED_RENAME -# endif -#else /* Imake configured, check known OS'es without rename() */ -# if defined(USG) && !defined(CRAY) && !defined(SVR4) && !defined(clipper) && !defined(__clipper__) -# define NEED_RENAME -# endif -#endif - -#ifdef NEED_RENAME +#ifndef HAVE_RENAME int rename (char *from, char *to) { (void) unlink (to); @@ -733,7 +708,7 @@ int rename (char *from, char *to) return -1; } } -#endif /* NEED_RENAME */ +#endif /* !HAVE_RENAME */ static void redirect(const char *line, const char *makefile) |