From owner-svn-soc-all@freebsd.org  Fri Jul  3 21:47:37 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 B2CDE9941EC
 for <svn-soc-all@mailman.ysv.freebsd.org>;
 Fri,  3 Jul 2015 21:47:37 +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 A41671058
 for <svn-soc-all@FreeBSD.org>; Fri,  3 Jul 2015 21:47:37 +0000 (UTC)
 (envelope-from clord@FreeBSD.org)
Received: from socsvn.freebsd.org ([127.0.1.124])
 by socsvn.freebsd.org (8.14.9/8.14.9) with ESMTP id t63LlbG3065401
 for <svn-soc-all@FreeBSD.org>; Fri, 3 Jul 2015 21:47:37 GMT
 (envelope-from clord@FreeBSD.org)
Received: (from www@localhost)
 by socsvn.freebsd.org (8.14.9/8.14.9/Submit) id t63LlbaU065393
 for svn-soc-all@FreeBSD.org; Fri, 3 Jul 2015 21:47:37 GMT
 (envelope-from clord@FreeBSD.org)
Date: Fri, 3 Jul 2015 21:47:37 GMT
Message-Id: <201507032147.t63LlbaU065393@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: r287930 - soc2015/clord/head/sys/contrib/ficl
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: Fri, 03 Jul 2015 21:47:37 -0000

Author: clord
Date: Fri Jul  3 21:47:36 2015
New Revision: 287930
URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=287930

Log:
  Include ficlcompatibility.h a little sooner so to avoid problem of compiler
  not seeing FICL_VM as a valid type. Also delete an extra #endif conditional
  directive.
  

Modified:
  soc2015/clord/head/sys/contrib/ficl/ficl.h

Modified: soc2015/clord/head/sys/contrib/ficl/ficl.h
==============================================================================
--- soc2015/clord/head/sys/contrib/ficl/ficl.h	Fri Jul  3 21:42:00 2015	(r287929)
+++ soc2015/clord/head/sys/contrib/ficl/ficl.h	Fri Jul  3 21:47:36 2015	(r287930)
@@ -1622,6 +1622,9 @@
 
 #define ficlSystemGetContext(system) ((system)->context)
 
+#if FICL_WANT_COMPATIBILITY
+	#include "ficlcompatibility.h"
+#endif /* FICL_WANT_COMPATIBILITY */
 
 /*
 ** External interface to Ficl...
@@ -1809,7 +1812,6 @@
     FILE *f;
     char filename[256];
 } ficlFile;
-#endif
 
 
 #if defined (FICL_PLATFORM_HAS_FTRUNCATE)
@@ -1871,11 +1873,6 @@
 
 
 
-#if FICL_WANT_COMPATIBILITY
-	#include "ficlcompatibility.h"
-#endif /* FICL_WANT_COMPATIBILITY */
-
-
 #ifdef __cplusplus
 }
 #endif