Index: generic/xotcl.h
===================================================================
diff -u -rc72f9f638677608fab1502cd696c8f2d6b2952f9 -r46f02e4868e118466d888b35d6b281b3f2ba31ac
--- generic/xotcl.h	(.../xotcl.h)	(revision c72f9f638677608fab1502cd696c8f2d6b2952f9)
+++ generic/xotcl.h	(.../xotcl.h)	(revision 46f02e4868e118466d888b35d6b281b3f2ba31ac)
@@ -1,6 +1,6 @@
 /* -*- Mode: c++ -*-
  *
- *  $Id: xotcl.h,v 1.13 2007/09/18 19:27:33 neumann Exp $
+ *  $Id: xotcl.h,v 1.11 2006/09/27 08:12:40 neumann Exp $
  *  
  *  Extended Object Tcl (XOTcl)
  *
@@ -40,10 +40,7 @@
 # endif
 #endif
 
-/* use documented interface to link XOTcl state to an interpreter */
-#define USE_ASSOC_DATA 1
-
-/* new namespace support (post 1.2.0 */
+/* new namespace support (post 1.2.0) */
 #define NAMESPACEINSTPROCS 1
 
 /* activate bytecode support 
@@ -141,8 +138,10 @@
 # endif
 #endif
 
-#define XOTCL_NONLEAF_METHOD (ClientData)0x01
+#define XOTCL_PROTECTED_METHOD 0x00010000
+#define XOTCL_NONLEAF_METHOD   0x00020000
 
+
 /* 
  * A special definition used to allow this header file to be included 
  * in resource files so that they can get obtain version information from
@@ -204,4 +203,9 @@
 #undef TCL_STORAGE_CLASS
 #define TCL_STORAGE_CLASS DLLIMPORT
 
+/* backwards compatibility */
+
+#define XOTclOGetInstVar2 XOTcl_ObjGetVar2
+#define XOTclOSetInstVar2 XOTcl_ObjSetVar2
+
 #endif /* _xotcl_h_ */