socsvn commit: r289732 - soc2015/clord/head/sys/contrib/ficl

[clord at FreeBSD.org]

Author: clord
Date: Fri Aug 14 02:07:53 2015
New Revision: 289732
URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=289732

Log:
  Include a test for TESTMAIN around pcibios functions.
  

Modified:
  soc2015/clord/head/sys/contrib/ficl/loader.c

Modified: soc2015/clord/head/sys/contrib/ficl/loader.c
==============================================================================
--- soc2015/clord/head/sys/contrib/ficl/loader.c	Fri Aug 14 02:05:39 2015	(r289731)
+++ soc2015/clord/head/sys/contrib/ficl/loader.c	Fri Aug 14 02:07:53 2015	(r289732)
@@ -729,6 +729,7 @@
 }
 
 
+#ifndef TESTMAIN
 #ifdef __i386__
 /*
  * pcibios-device-count (devid -- count)
@@ -863,6 +864,7 @@
 	stackPushINT(pVM->pStack, locator);
 }
 #endif
+#endif /* TESTMAIN */
 
 /*
 ** Retrieves free space remaining on the dictionary
@@ -931,6 +933,7 @@
     dictAppendWord(dp, "pnphandlers",ficlPnphandlers, FW_DEFAULT);
 #endif
 #endif
+#ifndef TESTMAIN
 #ifdef __i386__
     dictAppendWord(dp, "pcibios-device-count", ficlPciBiosCountDevices, FW_DEFAULT);
     dictAppendWord(dp, "pcibios-read-config", ficlPciBiosReadConfig, FW_DEFAULT);
@@ -939,6 +942,7 @@
     dictAppendWord(dp, "pcibios-find-device", ficlPciBiosFindDevice, FW_DEFAULT);
     dictAppendWord(dp, "pcibios-locator", ficlPciBiosLocator, FW_DEFAULT);
 #endif
+#endif
 
 #if defined(PC98)
     ficlSetEnv(pSys, "arch-pc98",         FICL_TRUE);