Index: generic/nxDecls.h =================================================================== diff -u -raf4326a00a0f2d0b2f1e0369af71637f48c2d56a -r8aaec98df564488dc8540cd078d6a32dd55a08f7 --- generic/nxDecls.h (.../nxDecls.h) (revision af4326a00a0f2d0b2f1e0369af71637f48c2d56a) +++ generic/nxDecls.h (.../nxDecls.h) (revision 8aaec98df564488dc8540cd078d6a32dd55a08f7) @@ -28,208 +28,206 @@ #ifndef Nx_Init_TCL_DECLARED #define Nx_Init_TCL_DECLARED /* 0 */ -EXTERN int Nx_Init (Tcl_Interp * interp); +EXTERN int Nx_Init(Tcl_Interp *interp); #endif /* Slot 1 is reserved */ #ifndef XOTclIsClass_TCL_DECLARED #define XOTclIsClass_TCL_DECLARED /* 2 */ -EXTERN struct XOTcl_Class * XOTclIsClass (Tcl_Interp * interp, ClientData cd); +EXTERN struct XOTcl_Class * XOTclIsClass(Tcl_Interp *interp, ClientData cd); #endif /* Slot 3 is reserved */ #ifndef XOTclGetObject_TCL_DECLARED #define XOTclGetObject_TCL_DECLARED /* 4 */ -EXTERN struct XOTcl_Object * XOTclGetObject (Tcl_Interp * interp, - CONST char * name); +EXTERN struct XOTcl_Object * XOTclGetObject(Tcl_Interp *interp, + CONST char *name); #endif #ifndef XOTclGetClass_TCL_DECLARED #define XOTclGetClass_TCL_DECLARED /* 5 */ -EXTERN struct XOTcl_Class * XOTclGetClass (Tcl_Interp * interp, - CONST char * name); +EXTERN struct XOTcl_Class * XOTclGetClass(Tcl_Interp *interp, + CONST char *name); #endif #ifndef XOTclCreateObject_TCL_DECLARED #define XOTclCreateObject_TCL_DECLARED /* 6 */ -EXTERN int XOTclCreateObject (Tcl_Interp * interp, - Tcl_Obj * name, struct XOTcl_Class * cl); +EXTERN int XOTclCreateObject(Tcl_Interp *interp, Tcl_Obj *name, + struct XOTcl_Class *cl); #endif /* Slot 7 is reserved */ /* Slot 8 is reserved */ #ifndef XOTclDeleteObject_TCL_DECLARED #define XOTclDeleteObject_TCL_DECLARED /* 9 */ -EXTERN int XOTclDeleteObject (Tcl_Interp * interp, - struct XOTcl_Object * obj); +EXTERN int XOTclDeleteObject(Tcl_Interp *interp, + struct XOTcl_Object *obj); #endif /* Slot 10 is reserved */ /* Slot 11 is reserved */ /* Slot 12 is reserved */ #ifndef XOTclRemoveObjectMethod_TCL_DECLARED #define XOTclRemoveObjectMethod_TCL_DECLARED /* 13 */ -EXTERN int XOTclRemoveObjectMethod (Tcl_Interp * interp, - struct XOTcl_Object * obj, CONST char * nm); +EXTERN int XOTclRemoveObjectMethod(Tcl_Interp *interp, + struct XOTcl_Object *obj, CONST char *nm); #endif #ifndef XOTclRemoveClassMethod_TCL_DECLARED #define XOTclRemoveClassMethod_TCL_DECLARED /* 14 */ -EXTERN int XOTclRemoveClassMethod (Tcl_Interp * interp, - struct XOTcl_Class * cl, CONST char * nm); +EXTERN int XOTclRemoveClassMethod(Tcl_Interp *interp, + struct XOTcl_Class *cl, CONST char *nm); #endif #ifndef XOTclOSetInstVar_TCL_DECLARED #define XOTclOSetInstVar_TCL_DECLARED /* 15 */ -EXTERN Tcl_Obj * XOTclOSetInstVar (struct XOTcl_Object * obj, - Tcl_Interp * interp, Tcl_Obj * name, - Tcl_Obj * value, int flgs); +EXTERN Tcl_Obj * XOTclOSetInstVar(struct XOTcl_Object *obj, + Tcl_Interp *interp, Tcl_Obj *name, + Tcl_Obj *value, int flgs); #endif #ifndef XOTclOGetInstVar_TCL_DECLARED #define XOTclOGetInstVar_TCL_DECLARED /* 16 */ -EXTERN Tcl_Obj * XOTclOGetInstVar (struct XOTcl_Object * obj, - Tcl_Interp * interp, Tcl_Obj * name, - int flgs); +EXTERN Tcl_Obj * XOTclOGetInstVar(struct XOTcl_Object *obj, + Tcl_Interp *interp, Tcl_Obj *name, int flgs); #endif /* Slot 17 is reserved */ /* Slot 18 is reserved */ #ifndef XOTcl_ObjSetVar2_TCL_DECLARED #define XOTcl_ObjSetVar2_TCL_DECLARED /* 19 */ -EXTERN Tcl_Obj * XOTcl_ObjSetVar2 (struct XOTcl_Object * obj, - Tcl_Interp * interp, Tcl_Obj * name1, - Tcl_Obj * name2, Tcl_Obj * value, int flgs); +EXTERN Tcl_Obj * XOTcl_ObjSetVar2(struct XOTcl_Object *obj, + Tcl_Interp *interp, Tcl_Obj *name1, + Tcl_Obj *name2, Tcl_Obj *value, int flgs); #endif #ifndef XOTcl_ObjGetVar2_TCL_DECLARED #define XOTcl_ObjGetVar2_TCL_DECLARED /* 20 */ -EXTERN Tcl_Obj * XOTcl_ObjGetVar2 (struct XOTcl_Object * obj, - Tcl_Interp * interp, Tcl_Obj * name1, - Tcl_Obj * name2, int flgs); +EXTERN Tcl_Obj * XOTcl_ObjGetVar2(struct XOTcl_Object *obj, + Tcl_Interp *interp, Tcl_Obj *name1, + Tcl_Obj *name2, int flgs); #endif #ifndef XOTclUnsetInstVar2_TCL_DECLARED #define XOTclUnsetInstVar2_TCL_DECLARED /* 21 */ -EXTERN int XOTclUnsetInstVar2 (struct XOTcl_Object * obj, - Tcl_Interp * interp, CONST char * name1, - CONST char * name2, int flgs); +EXTERN int XOTclUnsetInstVar2(struct XOTcl_Object *obj, + Tcl_Interp *interp, CONST char *name1, + CONST char *name2, int flgs); #endif /* Slot 22 is reserved */ #ifndef XOTclErrMsg_TCL_DECLARED #define XOTclErrMsg_TCL_DECLARED /* 23 */ -EXTERN int XOTclErrMsg (Tcl_Interp * interp, char * msg, - Tcl_FreeProc * type); +EXTERN int XOTclErrMsg(Tcl_Interp *interp, char *msg, + Tcl_FreeProc *type); #endif #ifndef XOTclVarErrMsg_TCL_DECLARED #define XOTclVarErrMsg_TCL_DECLARED /* 24 */ -EXTERN int XOTclVarErrMsg (Tcl_Interp * interp, ...); +EXTERN int XOTclVarErrMsg(Tcl_Interp *interp, ...); #endif #ifndef XOTclErrInProc_TCL_DECLARED #define XOTclErrInProc_TCL_DECLARED /* 25 */ -EXTERN int XOTclErrInProc (Tcl_Interp * interp, - Tcl_Obj * objName, Tcl_Obj * clName, - CONST char * procName); +EXTERN int XOTclErrInProc(Tcl_Interp *interp, Tcl_Obj *objName, + Tcl_Obj *clName, CONST char *procName); #endif /* Slot 26 is reserved */ #ifndef XOTclErrBadVal__TCL_DECLARED #define XOTclErrBadVal__TCL_DECLARED /* 27 */ -EXTERN int XOTclErrBadVal_ (Tcl_Interp * interp, - char * expected, char * value); +EXTERN int XOTclErrBadVal_(Tcl_Interp *interp, char *expected, + char *value); #endif #ifndef XOTclObjErrType_TCL_DECLARED #define XOTclObjErrType_TCL_DECLARED /* 28 */ -EXTERN int XOTclObjErrType (Tcl_Interp * interp, Tcl_Obj * nm, - char * wt, char * parameterName); +EXTERN int XOTclObjErrType(Tcl_Interp *interp, Tcl_Obj *nm, + char *wt, char *parameterName); #endif #ifndef XOTclStackDump_TCL_DECLARED #define XOTclStackDump_TCL_DECLARED /* 29 */ -EXTERN void XOTclStackDump (Tcl_Interp * interp); +EXTERN void XOTclStackDump(Tcl_Interp *interp); #endif /* Slot 30 is reserved */ /* Slot 31 is reserved */ #ifndef XOTclSetObjClientData_TCL_DECLARED #define XOTclSetObjClientData_TCL_DECLARED /* 32 */ -EXTERN void XOTclSetObjClientData (XOTcl_Object * obj, +EXTERN void XOTclSetObjClientData(XOTcl_Object *obj, ClientData data); #endif #ifndef XOTclGetObjClientData_TCL_DECLARED #define XOTclGetObjClientData_TCL_DECLARED /* 33 */ -EXTERN ClientData XOTclGetObjClientData (XOTcl_Object * obj); +EXTERN ClientData XOTclGetObjClientData(XOTcl_Object *obj); #endif #ifndef XOTclSetClassClientData_TCL_DECLARED #define XOTclSetClassClientData_TCL_DECLARED /* 34 */ -EXTERN void XOTclSetClassClientData (XOTcl_Class * cl, +EXTERN void XOTclSetClassClientData(XOTcl_Class *cl, ClientData data); #endif #ifndef XOTclGetClassClientData_TCL_DECLARED #define XOTclGetClassClientData_TCL_DECLARED /* 35 */ -EXTERN ClientData XOTclGetClassClientData (XOTcl_Class * cl); +EXTERN ClientData XOTclGetClassClientData(XOTcl_Class *cl); #endif #ifndef XOTclRequireObjNamespace_TCL_DECLARED #define XOTclRequireObjNamespace_TCL_DECLARED /* 36 */ -EXTERN void XOTclRequireObjNamespace (Tcl_Interp * interp, - XOTcl_Object * obj); +EXTERN void XOTclRequireObjNamespace(Tcl_Interp *interp, + XOTcl_Object *obj); #endif #ifndef XOTclErrBadVal_TCL_DECLARED #define XOTclErrBadVal_TCL_DECLARED /* 37 */ -EXTERN int XOTclErrBadVal (Tcl_Interp * interp, char * context, - char * expected, CONST char * value); +EXTERN int XOTclErrBadVal(Tcl_Interp *interp, char *context, + char *expected, CONST char *value); #endif #ifndef XOTclNextObjCmd_TCL_DECLARED #define XOTclNextObjCmd_TCL_DECLARED /* 38 */ -EXTERN int XOTclNextObjCmd (ClientData cd, Tcl_Interp * interp, +EXTERN int XOTclNextObjCmd(ClientData cd, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[]); #endif #ifndef XOTclCallMethodWithArgs_TCL_DECLARED #define XOTclCallMethodWithArgs_TCL_DECLARED /* 39 */ -EXTERN int XOTclCallMethodWithArgs (ClientData cd, - Tcl_Interp * interp, Tcl_Obj * method, - Tcl_Obj * arg, int objc, +EXTERN int XOTclCallMethodWithArgs(ClientData cd, + Tcl_Interp *interp, Tcl_Obj *method, + Tcl_Obj *arg, int objc, Tcl_Obj *CONST objv[], int flags); #endif #ifndef XOTclObjErrArgCnt_TCL_DECLARED #define XOTclObjErrArgCnt_TCL_DECLARED /* 40 */ -EXTERN int XOTclObjErrArgCnt (Tcl_Interp * interp, - Tcl_Obj * cmdName, Tcl_Obj * methodName, - char * arglist); +EXTERN int XOTclObjErrArgCnt(Tcl_Interp *interp, + Tcl_Obj *cmdName, Tcl_Obj *methodName, + char *arglist); #endif #ifndef XOTclAddObjectMethod_TCL_DECLARED #define XOTclAddObjectMethod_TCL_DECLARED /* 41 */ -EXTERN int XOTclAddObjectMethod (Tcl_Interp * interp, - struct XOTcl_Object * obj, CONST char * nm, - Tcl_ObjCmdProc * proc, ClientData cd, - Tcl_CmdDeleteProc * dp, int flags); +EXTERN int XOTclAddObjectMethod(Tcl_Interp *interp, + struct XOTcl_Object *obj, CONST char *nm, + Tcl_ObjCmdProc *proc, ClientData cd, + Tcl_CmdDeleteProc *dp, int flags); #endif #ifndef XOTclAddClassMethod_TCL_DECLARED #define XOTclAddClassMethod_TCL_DECLARED /* 42 */ -EXTERN int XOTclAddClassMethod (Tcl_Interp * interp, - struct XOTcl_Class * cl, CONST char * nm, - Tcl_ObjCmdProc * proc, ClientData cd, - Tcl_CmdDeleteProc * dp, int flags); +EXTERN int XOTclAddClassMethod(Tcl_Interp *interp, + struct XOTcl_Class *cl, CONST char *nm, + Tcl_ObjCmdProc *proc, ClientData cd, + Tcl_CmdDeleteProc *dp, int flags); #endif #ifndef XOTclCreate_TCL_DECLARED #define XOTclCreate_TCL_DECLARED /* 43 */ -EXTERN int XOTclCreate (Tcl_Interp * in, XOTcl_Class * class, - Tcl_Obj * name, ClientData data, int objc, +EXTERN int XOTclCreate(Tcl_Interp *in, XOTcl_Class *class, + Tcl_Obj *name, ClientData data, int objc, Tcl_Obj *CONST objv[]); #endif @@ -241,50 +239,50 @@ int magic; struct NxStubHooks *hooks; - int (*nx_Init) (Tcl_Interp * interp); /* 0 */ + int (*nx_Init) (Tcl_Interp *interp); /* 0 */ void *reserved1; - struct XOTcl_Class * (*xOTclIsClass) (Tcl_Interp * interp, ClientData cd); /* 2 */ + struct XOTcl_Class * (*xOTclIsClass) (Tcl_Interp *interp, ClientData cd); /* 2 */ void *reserved3; - struct XOTcl_Object * (*xOTclGetObject) (Tcl_Interp * interp, CONST char * name); /* 4 */ - struct XOTcl_Class * (*xOTclGetClass) (Tcl_Interp * interp, CONST char * name); /* 5 */ - int (*xOTclCreateObject) (Tcl_Interp * interp, Tcl_Obj * name, struct XOTcl_Class * cl); /* 6 */ + struct XOTcl_Object * (*xOTclGetObject) (Tcl_Interp *interp, CONST char *name); /* 4 */ + struct XOTcl_Class * (*xOTclGetClass) (Tcl_Interp *interp, CONST char *name); /* 5 */ + int (*xOTclCreateObject) (Tcl_Interp *interp, Tcl_Obj *name, struct XOTcl_Class *cl); /* 6 */ void *reserved7; void *reserved8; - int (*xOTclDeleteObject) (Tcl_Interp * interp, struct XOTcl_Object * obj); /* 9 */ + int (*xOTclDeleteObject) (Tcl_Interp *interp, struct XOTcl_Object *obj); /* 9 */ void *reserved10; void *reserved11; void *reserved12; - int (*xOTclRemoveObjectMethod) (Tcl_Interp * interp, struct XOTcl_Object * obj, CONST char * nm); /* 13 */ - int (*xOTclRemoveClassMethod) (Tcl_Interp * interp, struct XOTcl_Class * cl, CONST char * nm); /* 14 */ - Tcl_Obj * (*xOTclOSetInstVar) (struct XOTcl_Object * obj, Tcl_Interp * interp, Tcl_Obj * name, Tcl_Obj * value, int flgs); /* 15 */ - Tcl_Obj * (*xOTclOGetInstVar) (struct XOTcl_Object * obj, Tcl_Interp * interp, Tcl_Obj * name, int flgs); /* 16 */ + int (*xOTclRemoveObjectMethod) (Tcl_Interp *interp, struct XOTcl_Object *obj, CONST char *nm); /* 13 */ + int (*xOTclRemoveClassMethod) (Tcl_Interp *interp, struct XOTcl_Class *cl, CONST char *nm); /* 14 */ + Tcl_Obj * (*xOTclOSetInstVar) (struct XOTcl_Object *obj, Tcl_Interp *interp, Tcl_Obj *name, Tcl_Obj *value, int flgs); /* 15 */ + Tcl_Obj * (*xOTclOGetInstVar) (struct XOTcl_Object *obj, Tcl_Interp *interp, Tcl_Obj *name, int flgs); /* 16 */ void *reserved17; void *reserved18; - Tcl_Obj * (*xOTcl_ObjSetVar2) (struct XOTcl_Object * obj, Tcl_Interp * interp, Tcl_Obj * name1, Tcl_Obj * name2, Tcl_Obj * value, int flgs); /* 19 */ - Tcl_Obj * (*xOTcl_ObjGetVar2) (struct XOTcl_Object * obj, Tcl_Interp * interp, Tcl_Obj * name1, Tcl_Obj * name2, int flgs); /* 20 */ - int (*xOTclUnsetInstVar2) (struct XOTcl_Object * obj, Tcl_Interp * interp, CONST char * name1, CONST char * name2, int flgs); /* 21 */ + Tcl_Obj * (*xOTcl_ObjSetVar2) (struct XOTcl_Object *obj, Tcl_Interp *interp, Tcl_Obj *name1, Tcl_Obj *name2, Tcl_Obj *value, int flgs); /* 19 */ + Tcl_Obj * (*xOTcl_ObjGetVar2) (struct XOTcl_Object *obj, Tcl_Interp *interp, Tcl_Obj *name1, Tcl_Obj *name2, int flgs); /* 20 */ + int (*xOTclUnsetInstVar2) (struct XOTcl_Object *obj, Tcl_Interp *interp, CONST char *name1, CONST char *name2, int flgs); /* 21 */ void *reserved22; - int (*xOTclErrMsg) (Tcl_Interp * interp, char * msg, Tcl_FreeProc * type); /* 23 */ - int (*xOTclVarErrMsg) (Tcl_Interp * interp, ...); /* 24 */ - int (*xOTclErrInProc) (Tcl_Interp * interp, Tcl_Obj * objName, Tcl_Obj * clName, CONST char * procName); /* 25 */ + int (*xOTclErrMsg) (Tcl_Interp *interp, char *msg, Tcl_FreeProc *type); /* 23 */ + int (*xOTclVarErrMsg) (Tcl_Interp *interp, ...); /* 24 */ + int (*xOTclErrInProc) (Tcl_Interp *interp, Tcl_Obj *objName, Tcl_Obj *clName, CONST char *procName); /* 25 */ void *reserved26; - int (*xOTclErrBadVal_) (Tcl_Interp * interp, char * expected, char * value); /* 27 */ - int (*xOTclObjErrType) (Tcl_Interp * interp, Tcl_Obj * nm, char * wt, char * parameterName); /* 28 */ - void (*xOTclStackDump) (Tcl_Interp * interp); /* 29 */ + int (*xOTclErrBadVal_) (Tcl_Interp *interp, char *expected, char *value); /* 27 */ + int (*xOTclObjErrType) (Tcl_Interp *interp, Tcl_Obj *nm, char *wt, char *parameterName); /* 28 */ + void (*xOTclStackDump) (Tcl_Interp *interp); /* 29 */ void *reserved30; void *reserved31; - void (*xOTclSetObjClientData) (XOTcl_Object * obj, ClientData data); /* 32 */ - ClientData (*xOTclGetObjClientData) (XOTcl_Object * obj); /* 33 */ - void (*xOTclSetClassClientData) (XOTcl_Class * cl, ClientData data); /* 34 */ - ClientData (*xOTclGetClassClientData) (XOTcl_Class * cl); /* 35 */ - void (*xOTclRequireObjNamespace) (Tcl_Interp * interp, XOTcl_Object * obj); /* 36 */ - int (*xOTclErrBadVal) (Tcl_Interp * interp, char * context, char * expected, CONST char * value); /* 37 */ - int (*xOTclNextObjCmd) (ClientData cd, Tcl_Interp * interp, int objc, Tcl_Obj *CONST objv[]); /* 38 */ - int (*xOTclCallMethodWithArgs) (ClientData cd, Tcl_Interp * interp, Tcl_Obj * method, Tcl_Obj * arg, int objc, Tcl_Obj *CONST objv[], int flags); /* 39 */ - int (*xOTclObjErrArgCnt) (Tcl_Interp * interp, Tcl_Obj * cmdName, Tcl_Obj * methodName, char * arglist); /* 40 */ - int (*xOTclAddObjectMethod) (Tcl_Interp * interp, struct XOTcl_Object * obj, CONST char * nm, Tcl_ObjCmdProc * proc, ClientData cd, Tcl_CmdDeleteProc * dp, int flags); /* 41 */ - int (*xOTclAddClassMethod) (Tcl_Interp * interp, struct XOTcl_Class * cl, CONST char * nm, Tcl_ObjCmdProc * proc, ClientData cd, Tcl_CmdDeleteProc * dp, int flags); /* 42 */ - int (*xOTclCreate) (Tcl_Interp * in, XOTcl_Class * class, Tcl_Obj * name, ClientData data, int objc, Tcl_Obj *CONST objv[]); /* 43 */ + void (*xOTclSetObjClientData) (XOTcl_Object *obj, ClientData data); /* 32 */ + ClientData (*xOTclGetObjClientData) (XOTcl_Object *obj); /* 33 */ + void (*xOTclSetClassClientData) (XOTcl_Class *cl, ClientData data); /* 34 */ + ClientData (*xOTclGetClassClientData) (XOTcl_Class *cl); /* 35 */ + void (*xOTclRequireObjNamespace) (Tcl_Interp *interp, XOTcl_Object *obj); /* 36 */ + int (*xOTclErrBadVal) (Tcl_Interp *interp, char *context, char *expected, CONST char *value); /* 37 */ + int (*xOTclNextObjCmd) (ClientData cd, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[]); /* 38 */ + int (*xOTclCallMethodWithArgs) (ClientData cd, Tcl_Interp *interp, Tcl_Obj *method, Tcl_Obj *arg, int objc, Tcl_Obj *CONST objv[], int flags); /* 39 */ + int (*xOTclObjErrArgCnt) (Tcl_Interp *interp, Tcl_Obj *cmdName, Tcl_Obj *methodName, char *arglist); /* 40 */ + int (*xOTclAddObjectMethod) (Tcl_Interp *interp, struct XOTcl_Object *obj, CONST char *nm, Tcl_ObjCmdProc *proc, ClientData cd, Tcl_CmdDeleteProc *dp, int flags); /* 41 */ + int (*xOTclAddClassMethod) (Tcl_Interp *interp, struct XOTcl_Class *cl, CONST char *nm, Tcl_ObjCmdProc *proc, ClientData cd, Tcl_CmdDeleteProc *dp, int flags); /* 42 */ + int (*xOTclCreate) (Tcl_Interp *in, XOTcl_Class *class, Tcl_Obj *name, ClientData data, int objc, Tcl_Obj *CONST objv[]); /* 43 */ } NxStubs; #ifdef __cplusplus