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