From: Dan Dennedy <dan@dennedy.org>
Date: Sun, 16 Sep 2012 18:54:57 +0000 (-0700)
Subject: cleanup sys/param.h include on FreeBSD
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=92cd5c3f9d4dd57e8bfcd2bb02c79e14f79f6d05;p=mlt

cleanup sys/param.h include on FreeBSD

Assisted by Albert Villa who says it is safe to assume sys/param.h is
available, which is needed for FreeBSD version check on whether to
include xlocale.h in mlt_property.h.
---

diff --git a/src/framework/Makefile b/src/framework/Makefile
index a493dfbc..fcb7a29b 100644
--- a/src/framework/Makefile
+++ b/src/framework/Makefile
@@ -18,11 +18,6 @@ NAME = libmlt$(LIBSUF)
 TARGET = $(NAME).$(version)
 SONAME = $(NAME).$(soversion)
 SHFLAGS += -Wl,-soname,$(SONAME)
-	ifeq ($(targetos), FreeBSD)
-		ifdef HAVE_SYS_PARAM_H
-			CFLAGS += -DHAVE_SYS_PARAM_H
-		endif
-	endif
 endif
 
 OBJS = mlt_frame.o \
diff --git a/src/framework/configure b/src/framework/configure
index 49ab5810..601b20c9 100755
--- a/src/framework/configure
+++ b/src/framework/configure
@@ -2,9 +2,3 @@
 echo "framework	-I$prefix/include -I$prefix/include/mlt -D_REENTRANT	-L$libdir -lmlt" >> ../../packages.dat
 
 echo > config.mak
-if [ "$(uname -s)" = "FreeBSD" ]
-then
-	printf "#include <sys/param.h>\n int main(){ return 0;}" | $CC -c -x c - >/dev/null 2>&1
-	[ "$?" -eq 0 ] && echo "HAVE_SYS_PARAM_H=1" >> config.mak
-fi
-exit 0
diff --git a/src/framework/mlt_property.h b/src/framework/mlt_property.h
index fe328a71..3322434e 100644
--- a/src/framework/mlt_property.h
+++ b/src/framework/mlt_property.h
@@ -26,7 +26,8 @@
 
 #include "mlt_types.h"
 
-#ifdef HAVE_SYS_PARAM_H
+#if defined(__FreeBSD__)
+/* This header has existed since 1994 and defines __FreeBSD_version below. */
 #include <sys/param.h>
 #endif