socsvn commit: r289575 - soc2015/clord/head/sys/contrib/ficl/amd64

[clord at FreeBSD.org]

Author: clord
Date: Tue Aug 11 06:27:31 2015
New Revision: 289575
URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=289575

Log:
  Modify amd64 header file to mirror changes made to i386/sysdep.h file
  

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

Modified: soc2015/clord/head/sys/contrib/ficl/amd64/sysdep.h
==============================================================================
--- soc2015/clord/head/sys/contrib/ficl/amd64/sysdep.h	Tue Aug 11 05:58:33 2015	(r289574)
+++ soc2015/clord/head/sys/contrib/ficl/amd64/sysdep.h	Tue Aug 11 06:27:31 2015	(r289575)
@@ -86,14 +86,6 @@
 #define UNS32 unsigned int
 #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
@@ -102,7 +94,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 long
@@ -112,10 +103,6 @@
 #define FICL_UNS unsigned long
 #endif
 
-#if !defined FICL_FLOAT
-#define FICL_FLOAT float
-#endif
-
 /*
 ** Ficl presently supports values of 32 and 64 for BITS_PER_CELL
 */
@@ -321,8 +308,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
 
 /*
@@ -332,12 +319,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
 
 /*
@@ -345,8 +332,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
 
 /*
@@ -430,5 +417,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__*/