[Patch 3034251] backport ttkGenStubs.tcl features to genStubs.tcl, partly: remove unneeded ifdeffery and put C++ guard around stubs pointer definition.

1 files changed, 9 insertions, 150 deletions

diff --git a/generic/tclOODecls.h b/generic/tclOODecls.h
index d6ed407..697570d 100644
--- a/generic/tclOODecls.h
+++ b/generic/tclOODecls.h
@@ -1,5 +1,5 @@
 /*
- * $Id: tclOODecls.h,v 1.15 2010/03/05 15:32:16 dkf Exp $
+ * $Id: tclOODecls.h,v 1.16 2010/08/19 04:26:03 nijtmans Exp $
  *
  * This file is (mostly) automatically generated from tclOO.decls.
  */
@@ -38,181 +38,94 @@ extern const char *TclOOInitializeStubs(Tcl_Interp *, const char *version);
  * Exported function declarations:
  */
 
-#ifndef Tcl_CopyObjectInstance_TCL_DECLARED
-#define Tcl_CopyObjectInstance_TCL_DECLARED
 /* 0 */
 EXTERN Tcl_Object	Tcl_CopyObjectInstance(Tcl_Interp *interp,
 				Tcl_Object sourceObject,
 				const char *targetName,
 				const char *targetNamespaceName);
-#endif
-#ifndef Tcl_GetClassAsObject_TCL_DECLARED
-#define Tcl_GetClassAsObject_TCL_DECLARED
 /* 1 */
 EXTERN Tcl_Object	Tcl_GetClassAsObject(Tcl_Class clazz);
-#endif
-#ifndef Tcl_GetObjectAsClass_TCL_DECLARED
-#define Tcl_GetObjectAsClass_TCL_DECLARED
 /* 2 */
 EXTERN Tcl_Class	Tcl_GetObjectAsClass(Tcl_Object object);
-#endif
-#ifndef Tcl_GetObjectCommand_TCL_DECLARED
-#define Tcl_GetObjectCommand_TCL_DECLARED
 /* 3 */
 EXTERN Tcl_Command	Tcl_GetObjectCommand(Tcl_Object object);
-#endif
-#ifndef Tcl_GetObjectFromObj_TCL_DECLARED
-#define Tcl_GetObjectFromObj_TCL_DECLARED
 /* 4 */
 EXTERN Tcl_Object	Tcl_GetObjectFromObj(Tcl_Interp *interp,
 				Tcl_Obj *objPtr);
-#endif
-#ifndef Tcl_GetObjectNamespace_TCL_DECLARED
-#define Tcl_GetObjectNamespace_TCL_DECLARED
 /* 5 */
 EXTERN Tcl_Namespace *	Tcl_GetObjectNamespace(Tcl_Object object);
-#endif
-#ifndef Tcl_MethodDeclarerClass_TCL_DECLARED
-#define Tcl_MethodDeclarerClass_TCL_DECLARED
 /* 6 */
 EXTERN Tcl_Class	Tcl_MethodDeclarerClass(Tcl_Method method);
-#endif
-#ifndef Tcl_MethodDeclarerObject_TCL_DECLARED
-#define Tcl_MethodDeclarerObject_TCL_DECLARED
 /* 7 */
 EXTERN Tcl_Object	Tcl_MethodDeclarerObject(Tcl_Method method);
-#endif
-#ifndef Tcl_MethodIsPublic_TCL_DECLARED
-#define Tcl_MethodIsPublic_TCL_DECLARED
 /* 8 */
 EXTERN int		Tcl_MethodIsPublic(Tcl_Method method);
-#endif
-#ifndef Tcl_MethodIsType_TCL_DECLARED
-#define Tcl_MethodIsType_TCL_DECLARED
 /* 9 */
 EXTERN int		Tcl_MethodIsType(Tcl_Method method,
 				const Tcl_MethodType *typePtr,
 				ClientData *clientDataPtr);
-#endif
-#ifndef Tcl_MethodName_TCL_DECLARED
-#define Tcl_MethodName_TCL_DECLARED
 /* 10 */
 EXTERN Tcl_Obj *	Tcl_MethodName(Tcl_Method method);
-#endif
-#ifndef Tcl_NewInstanceMethod_TCL_DECLARED
-#define Tcl_NewInstanceMethod_TCL_DECLARED
 /* 11 */
 EXTERN Tcl_Method	Tcl_NewInstanceMethod(Tcl_Interp *interp,
 				Tcl_Object object, Tcl_Obj *nameObj,
 				int isPublic, const Tcl_MethodType *typePtr,
 				ClientData clientData);
-#endif
-#ifndef Tcl_NewMethod_TCL_DECLARED
-#define Tcl_NewMethod_TCL_DECLARED
 /* 12 */
 EXTERN Tcl_Method	Tcl_NewMethod(Tcl_Interp *interp, Tcl_Class cls,
 				Tcl_Obj *nameObj, int isPublic,
 				const Tcl_MethodType *typePtr,
 				ClientData clientData);
-#endif
-#ifndef Tcl_NewObjectInstance_TCL_DECLARED
-#define Tcl_NewObjectInstance_TCL_DECLARED
 /* 13 */
 EXTERN Tcl_Object	Tcl_NewObjectInstance(Tcl_Interp *interp,
 				Tcl_Class cls, const char *nameStr,
 				const char *nsNameStr, int objc,
 				Tcl_Obj *const *objv, int skip);
-#endif
-#ifndef Tcl_ObjectDeleted_TCL_DECLARED
-#define Tcl_ObjectDeleted_TCL_DECLARED
 /* 14 */
 EXTERN int		Tcl_ObjectDeleted(Tcl_Object object);
-#endif
-#ifndef Tcl_ObjectContextIsFiltering_TCL_DECLARED
-#define Tcl_ObjectContextIsFiltering_TCL_DECLARED
 /* 15 */
 EXTERN int		Tcl_ObjectContextIsFiltering(
 				Tcl_ObjectContext context);
-#endif
-#ifndef Tcl_ObjectContextMethod_TCL_DECLARED
-#define Tcl_ObjectContextMethod_TCL_DECLARED
 /* 16 */
 EXTERN Tcl_Method	Tcl_ObjectContextMethod(Tcl_ObjectContext context);
-#endif
-#ifndef Tcl_ObjectContextObject_TCL_DECLARED
-#define Tcl_ObjectContextObject_TCL_DECLARED
 /* 17 */
 EXTERN Tcl_Object	Tcl_ObjectContextObject(Tcl_ObjectContext context);
-#endif
-#ifndef Tcl_ObjectContextSkippedArgs_TCL_DECLARED
-#define Tcl_ObjectContextSkippedArgs_TCL_DECLARED
 /* 18 */
 EXTERN int		Tcl_ObjectContextSkippedArgs(
 				Tcl_ObjectContext context);
-#endif
-#ifndef Tcl_ClassGetMetadata_TCL_DECLARED
-#define Tcl_ClassGetMetadata_TCL_DECLARED
 /* 19 */
 EXTERN ClientData	Tcl_ClassGetMetadata(Tcl_Class clazz,
 				const Tcl_ObjectMetadataType *typePtr);
-#endif
-#ifndef Tcl_ClassSetMetadata_TCL_DECLARED
-#define Tcl_ClassSetMetadata_TCL_DECLARED
 /* 20 */
 EXTERN void		Tcl_ClassSetMetadata(Tcl_Class clazz,
 				const Tcl_ObjectMetadataType *typePtr,
 				ClientData metadata);
-#endif
-#ifndef Tcl_ObjectGetMetadata_TCL_DECLARED
-#define Tcl_ObjectGetMetadata_TCL_DECLARED
 /* 21 */
 EXTERN ClientData	Tcl_ObjectGetMetadata(Tcl_Object object,
 				const Tcl_ObjectMetadataType *typePtr);
-#endif
-#ifndef Tcl_ObjectSetMetadata_TCL_DECLARED
-#define Tcl_ObjectSetMetadata_TCL_DECLARED
 /* 22 */
 EXTERN void		Tcl_ObjectSetMetadata(Tcl_Object object,
 				const Tcl_ObjectMetadataType *typePtr,
 				ClientData metadata);
-#endif
-#ifndef Tcl_ObjectContextInvokeNext_TCL_DECLARED
-#define Tcl_ObjectContextInvokeNext_TCL_DECLARED
 /* 23 */
 EXTERN int		Tcl_ObjectContextInvokeNext(Tcl_Interp *interp,
 				Tcl_ObjectContext context, int objc,
 				Tcl_Obj *const *objv, int skip);
-#endif
-#ifndef Tcl_ObjectGetMethodNameMapper_TCL_DECLARED
-#define Tcl_ObjectGetMethodNameMapper_TCL_DECLARED
 /* 24 */
 EXTERN Tcl_ObjectMapMethodNameProc * Tcl_ObjectGetMethodNameMapper(
 				Tcl_Object object);
-#endif
-#ifndef Tcl_ObjectSetMethodNameMapper_TCL_DECLARED
-#define Tcl_ObjectSetMethodNameMapper_TCL_DECLARED
 /* 25 */
 EXTERN void		Tcl_ObjectSetMethodNameMapper(Tcl_Object object,
 				Tcl_ObjectMapMethodNameProc *mapMethodNameProc);
-#endif
-#ifndef Tcl_ClassSetConstructor_TCL_DECLARED
-#define Tcl_ClassSetConstructor_TCL_DECLARED
 /* 26 */
 EXTERN void		Tcl_ClassSetConstructor(Tcl_Interp *interp,
 				Tcl_Class clazz, Tcl_Method method);
-#endif
-#ifndef Tcl_ClassSetDestructor_TCL_DECLARED
-#define Tcl_ClassSetDestructor_TCL_DECLARED
 /* 27 */
 EXTERN void		Tcl_ClassSetDestructor(Tcl_Interp *interp,
 				Tcl_Class clazz, Tcl_Method method);
-#endif
-#ifndef Tcl_GetObjectName_TCL_DECLARED
-#define Tcl_GetObjectName_TCL_DECLARED
 /* 28 */
 EXTERN Tcl_Obj *	Tcl_GetObjectName(Tcl_Interp *interp,
 				Tcl_Object object);
-#endif
 
 typedef struct TclOOStubHooks {
     const struct TclOOIntStubs *tclOOIntStubs;
@@ -253,134 +166,80 @@ typedef struct TclOOStubs {
     Tcl_Obj * (*tcl_GetObjectName) (Tcl_Interp *interp, Tcl_Object object); /* 28 */
 } TclOOStubs;
 
-#if defined(USE_TCLOO_STUBS) && !defined(USE_TCLOO_STUB_PROCS)
+#ifdef __cplusplus
+extern "C" {
+#endif
 extern const TclOOStubs *tclOOStubsPtr;
-#endif /* defined(USE_TCLOO_STUBS) && !defined(USE_TCLOO_STUB_PROCS) */
+#ifdef __cplusplus
+}
+#endif
 
-#if defined(USE_TCLOO_STUBS) && !defined(USE_TCLOO_STUB_PROCS)
+#if defined(USE_TCLOO_STUBS)
 
 /*
  * Inline function declarations:
  */
 
-#ifndef Tcl_CopyObjectInstance
 #define Tcl_CopyObjectInstance \
 	(tclOOStubsPtr->tcl_CopyObjectInstance) /* 0 */
-#endif
-#ifndef Tcl_GetClassAsObject
 #define Tcl_GetClassAsObject \
 	(tclOOStubsPtr->tcl_GetClassAsObject) /* 1 */
-#endif
-#ifndef Tcl_GetObjectAsClass
 #define Tcl_GetObjectAsClass \
 	(tclOOStubsPtr->tcl_GetObjectAsClass) /* 2 */
-#endif
-#ifndef Tcl_GetObjectCommand
 #define Tcl_GetObjectCommand \
 	(tclOOStubsPtr->tcl_GetObjectCommand) /* 3 */
-#endif
-#ifndef Tcl_GetObjectFromObj
 #define Tcl_GetObjectFromObj \
 	(tclOOStubsPtr->tcl_GetObjectFromObj) /* 4 */
-#endif
-#ifndef Tcl_GetObjectNamespace
 #define Tcl_GetObjectNamespace \
 	(tclOOStubsPtr->tcl_GetObjectNamespace) /* 5 */
-#endif
-#ifndef Tcl_MethodDeclarerClass
 #define Tcl_MethodDeclarerClass \
 	(tclOOStubsPtr->tcl_MethodDeclarerClass) /* 6 */
-#endif
-#ifndef Tcl_MethodDeclarerObject
 #define Tcl_MethodDeclarerObject \
 	(tclOOStubsPtr->tcl_MethodDeclarerObject) /* 7 */
-#endif
-#ifndef Tcl_MethodIsPublic
 #define Tcl_MethodIsPublic \
 	(tclOOStubsPtr->tcl_MethodIsPublic) /* 8 */
-#endif
-#ifndef Tcl_MethodIsType
 #define Tcl_MethodIsType \
 	(tclOOStubsPtr->tcl_MethodIsType) /* 9 */
-#endif
-#ifndef Tcl_MethodName
 #define Tcl_MethodName \
 	(tclOOStubsPtr->tcl_MethodName) /* 10 */
-#endif
-#ifndef Tcl_NewInstanceMethod
 #define Tcl_NewInstanceMethod \
 	(tclOOStubsPtr->tcl_NewInstanceMethod) /* 11 */
-#endif
-#ifndef Tcl_NewMethod
 #define Tcl_NewMethod \
 	(tclOOStubsPtr->tcl_NewMethod) /* 12 */
-#endif
-#ifndef Tcl_NewObjectInstance
 #define Tcl_NewObjectInstance \
 	(tclOOStubsPtr->tcl_NewObjectInstance) /* 13 */
-#endif
-#ifndef Tcl_ObjectDeleted
 #define Tcl_ObjectDeleted \
 	(tclOOStubsPtr->tcl_ObjectDeleted) /* 14 */
-#endif
-#ifndef Tcl_ObjectContextIsFiltering
 #define Tcl_ObjectContextIsFiltering \
 	(tclOOStubsPtr->tcl_ObjectContextIsFiltering) /* 15 */
-#endif
-#ifndef Tcl_ObjectContextMethod
 #define Tcl_ObjectContextMethod \
 	(tclOOStubsPtr->tcl_ObjectContextMethod) /* 16 */
-#endif
-#ifndef Tcl_ObjectContextObject
 #define Tcl_ObjectContextObject \
 	(tclOOStubsPtr->tcl_ObjectContextObject) /* 17 */
-#endif
-#ifndef Tcl_ObjectContextSkippedArgs
 #define Tcl_ObjectContextSkippedArgs \
 	(tclOOStubsPtr->tcl_ObjectContextSkippedArgs) /* 18 */
-#endif
-#ifndef Tcl_ClassGetMetadata
 #define Tcl_ClassGetMetadata \
 	(tclOOStubsPtr->tcl_ClassGetMetadata) /* 19 */
-#endif
-#ifndef Tcl_ClassSetMetadata
 #define Tcl_ClassSetMetadata \
 	(tclOOStubsPtr->tcl_ClassSetMetadata) /* 20 */
-#endif
-#ifndef Tcl_ObjectGetMetadata
 #define Tcl_ObjectGetMetadata \
 	(tclOOStubsPtr->tcl_ObjectGetMetadata) /* 21 */
-#endif
-#ifndef Tcl_ObjectSetMetadata
 #define Tcl_ObjectSetMetadata \
 	(tclOOStubsPtr->tcl_ObjectSetMetadata) /* 22 */
-#endif
-#ifndef Tcl_ObjectContextInvokeNext
 #define Tcl_ObjectContextInvokeNext \
 	(tclOOStubsPtr->tcl_ObjectContextInvokeNext) /* 23 */
-#endif
-#ifndef Tcl_ObjectGetMethodNameMapper
 #define Tcl_ObjectGetMethodNameMapper \
 	(tclOOStubsPtr->tcl_ObjectGetMethodNameMapper) /* 24 */
-#endif
-#ifndef Tcl_ObjectSetMethodNameMapper
 #define Tcl_ObjectSetMethodNameMapper \
 	(tclOOStubsPtr->tcl_ObjectSetMethodNameMapper) /* 25 */
-#endif
-#ifndef Tcl_ClassSetConstructor
 #define Tcl_ClassSetConstructor \
 	(tclOOStubsPtr->tcl_ClassSetConstructor) /* 26 */
-#endif
-#ifndef Tcl_ClassSetDestructor
 #define Tcl_ClassSetDestructor \
 	(tclOOStubsPtr->tcl_ClassSetDestructor) /* 27 */
-#endif
-#ifndef Tcl_GetObjectName
 #define Tcl_GetObjectName \
 	(tclOOStubsPtr->tcl_GetObjectName) /* 28 */
-#endif
 
-#endif /* defined(USE_TCLOO_STUBS) && !defined(USE_TCLOO_STUB_PROCS) */
+#endif /* defined(USE_TCLOO_STUBS) */
 
 /* !END!: Do not edit above this line. */