From owner-svn-soc-all@freebsd.org  Tue Jul 14 15:08:39 2015
Return-Path: <owner-svn-soc-all@freebsd.org>
Delivered-To: svn-soc-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 5DB469A1697
 for <svn-soc-all@mailman.ysv.freebsd.org>;
 Tue, 14 Jul 2015 15:08:39 +0000 (UTC)
 (envelope-from clord@FreeBSD.org)
Received: from socsvn.freebsd.org (socsvn.freebsd.org
 [IPv6:2001:1900:2254:206a::50:2])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 4E5D9A9B
 for <svn-soc-all@FreeBSD.org>; Tue, 14 Jul 2015 15:08:39 +0000 (UTC)
 (envelope-from clord@FreeBSD.org)
Received: from socsvn.freebsd.org ([127.0.1.124])
 by socsvn.freebsd.org (8.15.2/8.15.2) with ESMTP id t6EF8dWc099802
 for <svn-soc-all@FreeBSD.org>; Tue, 14 Jul 2015 15:08:39 GMT
 (envelope-from clord@FreeBSD.org)
Received: (from www@localhost)
 by socsvn.freebsd.org (8.15.2/8.15.2/Submit) id t6EF8b8T098321
 for svn-soc-all@FreeBSD.org; Tue, 14 Jul 2015 15:08:37 GMT
 (envelope-from clord@FreeBSD.org)
Date: Tue, 14 Jul 2015 15:08:37 GMT
Message-Id: <201507141508.t6EF8b8T098321@socsvn.freebsd.org>
X-Authentication-Warning: socsvn.freebsd.org: www set sender to
 clord@FreeBSD.org using -f
From: clord@FreeBSD.org
To: svn-soc-all@FreeBSD.org
Subject: socsvn commit: r288381 - in soc2015/clord/head/sys/contrib/ficl: .
 ficlplatform
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-soc-all@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for the entire Summer of Code repository
 <svn-soc-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-soc-all>,
 <mailto:svn-soc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-soc-all/>
List-Post: <mailto:svn-soc-all@freebsd.org>
List-Help: <mailto:svn-soc-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-soc-all>,
 <mailto:svn-soc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 14 Jul 2015 15:08:39 -0000

Author: clord
Date: Tue Jul 14 15:08:37 2015
New Revision: 288381
URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=288381

Log:
  Get rid of more conflicting header files.
  

Modified:
  soc2015/clord/head/sys/contrib/ficl/ficl.h
  soc2015/clord/head/sys/contrib/ficl/ficlplatform/unix.h
  soc2015/clord/head/sys/contrib/ficl/system.c

Modified: soc2015/clord/head/sys/contrib/ficl/ficl.h
==============================================================================
--- soc2015/clord/head/sys/contrib/ficl/ficl.h	Tue Jul 14 14:33:21 2015	(r288380)
+++ soc2015/clord/head/sys/contrib/ficl/ficl.h	Tue Jul 14 15:08:37 2015	(r288381)
@@ -148,7 +148,6 @@
 #include <setjmp.h>
 #include <stdarg.h>
 #include <stddef.h>
-#include <stdlib.h>
 #include <string.h>
 
 /*

Modified: soc2015/clord/head/sys/contrib/ficl/ficlplatform/unix.h
==============================================================================
--- soc2015/clord/head/sys/contrib/ficl/ficlplatform/unix.h	Tue Jul 14 14:33:21 2015	(r288380)
+++ soc2015/clord/head/sys/contrib/ficl/ficlplatform/unix.h	Tue Jul 14 15:08:37 2015	(r288381)
@@ -1,7 +1,6 @@
 /* $FreeBSD$ */
 
 #include <stdint.h>
-#include <unistd.h>
 
 
 #define FICL_WANT_PLATFORM (1)

Modified: soc2015/clord/head/sys/contrib/ficl/system.c
==============================================================================
--- soc2015/clord/head/sys/contrib/ficl/system.c	Tue Jul 14 14:33:21 2015	(r288380)
+++ soc2015/clord/head/sys/contrib/ficl/system.c	Tue Jul 14 15:08:37 2015	(r288381)
@@ -57,7 +57,11 @@
 
 /* $FreeBSD$ */
 
+#ifdef TESTMAIN
 #include <stdlib.h>
+#else
+#include <stand.h>
+#endif
 #include <string.h>
 #include "ficl.h"