From 24ad19c546ead5309c90a23e3dcad0bbfcc23cf8 Mon Sep 17 00:00:00 2001
From: Mark Murray <markm@FreeBSD.org>
Date: Sun, 20 Aug 2000 09:51:08 +0000
Subject: [PATCH] Resolve conflicts.

---
 contrib/perl5/perl.h | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/contrib/perl5/perl.h b/contrib/perl5/perl.h
index 9538e28a3820..1105563847fc 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"