From 7e97445a5a4797ba580a58c99d9e16836aa41188 Mon Sep 17 00:00:00 2001
From: Nick Alcock <nick.alcock@oracle.com>
Date: Sat, 13 Jul 2019 21:45:55 +0100
Subject: [PATCH] libctf: get rid of a disruptive public include of
 <sys/param.h>

This hoary old header defines things like MAX that users of libctf might
perfectly reasonably define themselves.

The CTF headers do not need it: move it into libctf/ctf-impl.h instead.

include/
	* ctf-api.h (includes): No longer include <sys/param.h>.
libctf/
	* ctf-impl.h (includes): Include <sys/param.h> here.
---
 include/ChangeLog | 4 ++++
 include/ctf-api.h | 1 -
 libctf/ChangeLog  | 4 ++++
 libctf/ctf-impl.h | 1 +
 4 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/include/ChangeLog b/include/ChangeLog
index ce7c17377a0..b53956f3486 100644
--- a/include/ChangeLog
+++ b/include/ChangeLog
@@ -1,3 +1,7 @@
+2019-07-13  Nick Alcock  <nick.alcock@oracle.com>
+
+	* ctf-api.h (includes): No longer include <sys/param.h>.
+
 2019-07-30  Nick Alcock  <nick.alcock@oracle.com>
 
 	* ctf-api.h (ctf_link_add_cu_mapping): New.
diff --git a/include/ctf-api.h b/include/ctf-api.h
index 4ac5fea8bc6..f50bb0a0199 100644
--- a/include/ctf-api.h
+++ b/include/ctf-api.h
@@ -24,7 +24,6 @@
 #ifndef	_CTF_API_H
 #define	_CTF_API_H
 
-#include <sys/param.h>
 #include <sys/types.h>
 #include <ctf.h>
 #include <zlib.h>
diff --git a/libctf/ChangeLog b/libctf/ChangeLog
index 83b316701b2..9637cf37af9 100644
--- a/libctf/ChangeLog
+++ b/libctf/ChangeLog
@@ -1,3 +1,7 @@
+2019-07-13  Nick Alcock  <nick.alcock@oracle.com>
+
+	* ctf-impl.h (includes): Include <sys/param.h> here.
+
 2019-07-30  Nick Alcock  <nick.alcock@oracle.com>
 
 	* ctf-open.c (flip_lbls): Eschew for-loop initial declarations.
diff --git a/libctf/ctf-impl.h b/libctf/ctf-impl.h
index 554b1872cbf..211099e1e87 100644
--- a/libctf/ctf-impl.h
+++ b/libctf/ctf-impl.h
@@ -22,6 +22,7 @@
 
 #include "config.h"
 #include <errno.h>
+#include <sys/param.h>
 #include "ctf-decls.h"
 #include <ctf-api.h>
 #include <sys/types.h>
-- 
2.30.2