socsvn commit: r288381 - in soc2015/clord/head/sys/contrib/ficl: . ficlplatform

[clord at FreeBSD.org]

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"