Index: generic/xotclIntDecls.h
===================================================================
diff -u -r044952af84b087821f5bd68570b84b8e3e000851 -rcde16e9d87173d7ef9179ce40e10c2f1f708940e
--- generic/xotclIntDecls.h	(.../xotclIntDecls.h)	(revision 044952af84b087821f5bd68570b84b8e3e000851)
+++ generic/xotclIntDecls.h	(.../xotclIntDecls.h)	(revision cde16e9d87173d7ef9179ce40e10c2f1f708940e)
@@ -31,13 +31,17 @@
 
 typedef struct XotclIntStubs {
     int magic;
-    const struct XotclIntStubHooks *hooks;
+    struct XotclIntStubHooks *hooks;
 
 } XotclIntStubs;
 
-#if defined(USE_XOTCL_STUBS) && !defined(USE_XOTCL_STUB_PROCS)
-extern const XotclIntStubs *xotclIntStubsPtr;
-#endif /* defined(USE_XOTCL_STUBS) && !defined(USE_XOTCL_STUB_PROCS) */
+#ifdef __cplusplus
+extern "C" {
+#endif
+extern XotclIntStubs *xotclIntStubsPtr;
+#ifdef __cplusplus
+}
+#endif
 
 #if defined(USE_XOTCL_STUBS) && !defined(USE_XOTCL_STUB_PROCS)