diff options
| author | markm <markm@FreeBSD.org> | 2000-08-20 09:51:08 +0000 |
|---|---|---|
| committer | markm <markm@FreeBSD.org> | 2000-08-20 09:51:08 +0000 |
| commit | 0c10af18c058283ed8a83546d0822ba01060a466 (patch) | |
| tree | 8d6023735f6340047f1637429f35f550ea288a3c | |
| parent | 9cc88c0c3c501bc5968de051ff9bfc321938d056 (diff) | |
| download | FreeBSD-src-0c10af18c058283ed8a83546d0822ba01060a466.zip FreeBSD-src-0c10af18c058283ed8a83546d0822ba01060a466.tar.gz | |
Resolve conflicts.
| -rw-r--r-- | contrib/perl5/perl.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/contrib/perl5/perl.h b/contrib/perl5/perl.h index 9538e28..1105563 100644 --- a/contrib/perl5/perl.h +++ b/contrib/perl5/perl.h @@ -3306,6 +3306,10 @@ typedef struct am_table_short AMTS; #endif /* IAMSUID */ +#ifdef I_LIBUTIL +# include <libutil.h> /* setproctitle() in some FreeBSDs */ +#endif + /* and finally... */ #define PERL_PATCHLEVEL_H_IMPLICIT #include "patchlevel.h" |
