Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 14 Jul 2015 15:22:07 GMT
From:      clord@FreeBSD.org
To:        svn-soc-all@FreeBSD.org
Subject:   socsvn commit: r288382 - soc2015/clord/head/sys/contrib/ficl/i386
Message-ID:  <201507141522.t6EFM7Oj063465@socsvn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: clord
Date: Tue Jul 14 15:22:06 2015
New Revision: 288382
URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=288382

Log:
  Fixes outdated definitions for various Ficl constants. Removes unnecessary
  definitions left from Ficl 3.
  

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

Modified: soc2015/clord/head/sys/contrib/ficl/i386/sysdep.h
==============================================================================
--- soc2015/clord/head/sys/contrib/ficl/i386/sysdep.h	Tue Jul 14 15:08:37 2015	(r288381)
+++ soc2015/clord/head/sys/contrib/ficl/i386/sysdep.h	Tue Jul 14 15:22:06 2015	(r288382)
@@ -84,14 +84,6 @@
 #define UNS32 unsigned long
 #endif
 
-#if !defined UNS16
-#define UNS16 unsigned short
-#endif
-
-#if !defined UNS8
-#define UNS8 unsigned char
-#endif
-
 #if !defined NULL
 #define NULL ((void *)0)
 #endif
@@ -100,7 +92,6 @@
 ** FICL_UNS and FICL_INT must have the same size as a void* on
 ** the target system. A CELL is a union of void*, FICL_UNS, and
 ** FICL_INT. 
-** (11/2000: same for FICL_FLOAT)
 */
 #if !defined FICL_INT
 #define FICL_INT INT32
@@ -110,10 +101,6 @@
 #define FICL_UNS UNS32
 #endif
 
-#if !defined FICL_FLOAT
-#define FICL_FLOAT float
-#endif
-
 /*
 ** Ficl presently supports values of 32 and 64 for BITS_PER_CELL
 */
@@ -319,8 +306,8 @@
 ** a new virtual machine's stacks, unless overridden at 
 ** create time.
 */
-#if !defined FICL_DEFAULT_STACK
-#define FICL_DEFAULT_STACK 128
+#if !defined FICL_DEFAULT_STACK_SIZE
+#define FICL_DEFAULT_STACK_SIZE 128
 #endif
 
 /*
@@ -330,12 +317,12 @@
 ** FICL_DEFAULT_ENV specifies the number of cells to allot
 ** for the environment-query dictionary.
 */
-#if !defined FICL_DEFAULT_DICT
-#define FICL_DEFAULT_DICT 12288
+#if !defined FICL_DEFAULT_DICTIONARY_SIZE
+#define FICL_DEFAULT_DICTIONARY_SIZE 12288
 #endif
 
-#if !defined FICL_DEFAULT_ENV
-#define FICL_DEFAULT_ENV 260
+#if !defined FICL_DEFAULT_ENVIRONMENT_SIZE
+#define FICL_DEFAULT_ENVIRONMENT_SIZE 260
 #endif
 
 /*
@@ -343,8 +330,8 @@
 ** the dictionary search order. See Forth DPANS sec 16.3.3
 ** (file://dpans16.htm#16.3.3)
 */
-#if !defined FICL_DEFAULT_VOCS
-#define FICL_DEFAULT_VOCS 16
+#if !defined FICL_MAX_WORDLISTS
+#define FICL_MAX_WORDLISTS 16
 #endif
 
 /*
@@ -428,5 +415,11 @@
 #define FICL_HAVE_FTRUNCATE 0
 #endif
 
+/*
+** Remove old definitions to remove conflicts with ficlcompatibility.h
+** in case FICL_WANT_COMPATIBILITY is set.
+*/
+#undef FICL_UNS
+#undef FICL_INT
 
 #endif /*__SYSDEP_H__*/



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201507141522.t6EFM7Oj063465>