Index: generic/xotcl.h
===================================================================
diff -u -r11d5a8a7fab7ba69a94b161bb9c0aae5a2636e7b -rd7b2898d74c2ff2158ae2cc4ca3f7a6d87533d45
--- generic/xotcl.h	(.../xotcl.h)	(revision 11d5a8a7fab7ba69a94b161bb9c0aae5a2636e7b)
+++ generic/xotcl.h	(.../xotcl.h)	(revision d7b2898d74c2ff2158ae2cc4ca3f7a6d87533d45)
@@ -38,7 +38,33 @@
 # endif
 #endif
 
+/*
+ * prevent old TCL-versions
+ */
 
+#if TCL_MAJOR_VERSION < 8
+# error Tcl distribution is TOO OLD, we require at least tcl8.5
+#endif
+
+#if TCL_MAJOR_VERSION==8 && TCL_MINOR_VERSION<5
+# error Tcl distribution is TOO OLD, we require at least tcl8.5
+#endif
+
+#if TCL_MAJOR_VERSION==8 && TCL_MINOR_VERSION<6
+# define PRE86
+#endif
+
+#if defined(PRE86)
+# define CONST86
+# define Tcl_GetErrorLine(interp) (interp)->errorLine
+#else
+# define NRE
+#endif
+
+/*
+ * Feature activation/deactivation
+ */
+
 /* activate bytecode support 
 #define XOTCL_BYTECODE
 */
@@ -77,20 +103,6 @@
 #define CMD_RESOLVER_TRACE 1
 */
 
-
-/* some features
-#define TCL85STACK 1
-#define CANONICAL_ARGS 1
-#define USE_COMPILED_VAR_RESOLVER 1
-*/
-
-#define USE_COMPILED_VAR_RESOLVER 1
-
-#if !defined(PRE86)
-#define CANONICAL_ARGS 1
-#define TCL85STACK 1
-#endif
-
 #if defined(PARSE_TRACE_FULL)
 # define PARSE_TRACE 1
 #endif
@@ -113,37 +125,6 @@
 # define DO_CLEANUP
 #endif
 
-/*
- * prevent old TCL-versions
- */
-
-#if TCL_MAJOR_VERSION < 8
-# error Tcl distribution is TOO OLD, we require at least tcl8.0
-#endif
-
-#if TCL_MAJOR_VERSION==8 && TCL_MINOR_VERSION<5
-# define PRE85
-#endif
-
-#if TCL_MAJOR_VERSION==8 && TCL_MINOR_VERSION<6
-# define PRE86
-#endif
-
-#if defined(PRE86)
-# define CONST86
-#else
-# define NRE
-#endif
-
-
-#if !defined(FORWARD_COMPATIBLE)
-# if defined(PRE85)
-#  define FORWARD_COMPATIBLE 1
-# else
-#  define FORWARD_COMPATIBLE 0
-# endif
-#endif
-
 /* 
  * A special definition used to allow this header file to be included 
  * in resource files so that they can get obtain version information from
@@ -154,13 +135,6 @@
 #ifndef RC_INVOKED
 
 /*
-#ifdef __cplusplus
-extern "C" {
-#endif
-*/
-
-
-/*
  * The structures XOTcl_Object and XOTcl_Class define mostly opaque 
  * data structures for the internal use strucures XOTclObject and 
  * XOTclClass (both defined in XOTclInt.h). Modification of elements 
@@ -205,9 +179,4 @@
 #undef TCL_STORAGE_CLASS
 #define TCL_STORAGE_CLASS DLLIMPORT
 
-/* backwards compatibility */
-
-#define XOTclOGetInstVar2 XOTcl_ObjGetVar2
-#define XOTclOSetInstVar2 XOTcl_ObjSetVar2
-
 #endif /* _xotcl_h_ */