From b8976fa1042002dfdf6692b7ae8b215423087d24 Mon Sep 17 00:00:00 2001 From: das Date: Wed, 2 Apr 2008 21:30:03 +0000 Subject: * generic/tclDecls.h: make genstubs * generic/tclIntDecls.h: * generic/tclIntPlatDecls.h: * generic/tclPlatDecls.h: * generic/tclStubInit.c: * generic/tclTomMathDecls.h: --- generic/tclDecls.h | 20 ++++++-------------- generic/tclIntDecls.h | 14 +++----------- generic/tclIntPlatDecls.h | 14 +++----------- generic/tclPlatDecls.h | 14 +++----------- generic/tclStubInit.c | 4 ++-- generic/tclTomMathDecls.h | 14 +++----------- 6 files changed, 20 insertions(+), 60 deletions(-) diff --git a/generic/tclDecls.h b/generic/tclDecls.h index db398d7..0a1d735 100644 --- a/generic/tclDecls.h +++ b/generic/tclDecls.h @@ -8,7 +8,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tclDecls.h,v 1.131 2008/04/01 16:23:40 dgp Exp $ + * RCS: @(#) $Id: tclDecls.h,v 1.132 2008/04/02 21:30:03 das Exp $ */ #ifndef _TCLDECLS @@ -3503,14 +3503,14 @@ EXTERN void Tcl_AppendPrintfToObj (Tcl_Obj * objPtr, #endif typedef struct TclStubHooks { - struct TclPlatStubs *tclPlatStubs; - struct TclIntStubs *tclIntStubs; - struct TclIntPlatStubs *tclIntPlatStubs; + CONST struct TclPlatStubs *tclPlatStubs; + CONST struct TclIntStubs *tclIntStubs; + CONST struct TclIntPlatStubs *tclIntPlatStubs; } TclStubHooks; typedef struct TclStubs { int magic; - struct TclStubHooks *hooks; + CONST struct TclStubHooks *hooks; int (*tcl_PkgProvideEx) (Tcl_Interp* interp, CONST char* name, CONST char* version, ClientData clientData); /* 0 */ CONST84_RETURN char * (*tcl_PkgRequireEx) (Tcl_Interp * interp, CONST char * name, CONST char * version, int exact, ClientData * clientDataPtr); /* 1 */ @@ -4143,15 +4143,7 @@ typedef struct TclStubs { } TclStubs; #if defined(USE_TCL_STUBS) && !defined(USE_TCL_STUB_PROCS) - -#ifdef __cplusplus -extern "C" { -#endif -extern TclStubs *tclStubsPtr; -#ifdef __cplusplus -} -#endif - +EXTERN CONST TclStubs *tclStubsPtr; #endif /* defined(USE_TCL_STUBS) && !defined(USE_TCL_STUB_PROCS) */ #if defined(USE_TCL_STUBS) && !defined(USE_TCL_STUB_PROCS) diff --git a/generic/tclIntDecls.h b/generic/tclIntDecls.h index 983b39c..04501dd 100644 --- a/generic/tclIntDecls.h +++ b/generic/tclIntDecls.h @@ -11,7 +11,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tclIntDecls.h,v 1.113 2008/04/01 16:23:41 dgp Exp $ + * RCS: @(#) $Id: tclIntDecls.h,v 1.114 2008/04/02 21:30:04 das Exp $ */ #ifndef _TCLINTDECLS @@ -1079,7 +1079,7 @@ EXTERN void TclBackgroundException (Tcl_Interp * interp, typedef struct TclIntStubs { int magic; - struct TclIntStubHooks *hooks; + CONST struct TclIntStubHooks *hooks; void *reserved0; void *reserved1; @@ -1345,15 +1345,7 @@ typedef struct TclIntStubs { } TclIntStubs; #if defined(USE_TCL_STUBS) && !defined(USE_TCL_STUB_PROCS) - -#ifdef __cplusplus -extern "C" { -#endif -extern TclIntStubs *tclIntStubsPtr; -#ifdef __cplusplus -} -#endif - +EXTERN CONST TclIntStubs *tclIntStubsPtr; #endif /* defined(USE_TCL_STUBS) && !defined(USE_TCL_STUB_PROCS) */ #if defined(USE_TCL_STUBS) && !defined(USE_TCL_STUB_PROCS) diff --git a/generic/tclIntPlatDecls.h b/generic/tclIntPlatDecls.h index 7b8ab8e..8985677 100644 --- a/generic/tclIntPlatDecls.h +++ b/generic/tclIntPlatDecls.h @@ -9,7 +9,7 @@ * Copyright (c) 1998-1999 by Scriptics Corporation. * All rights reserved. * - * RCS: @(#) $Id: tclIntPlatDecls.h,v 1.33 2008/04/01 16:23:41 dgp Exp $ + * RCS: @(#) $Id: tclIntPlatDecls.h,v 1.34 2008/04/02 21:30:04 das Exp $ */ #ifndef _TCLINTPLATDECLS @@ -372,7 +372,7 @@ EXTERN int TclMacOSXMatchType (Tcl_Interp * interp, typedef struct TclIntPlatStubs { int magic; - struct TclIntPlatStubHooks *hooks; + CONST struct TclIntPlatStubHooks *hooks; #if !defined(__WIN32__) && !defined(MAC_OSX_TCL) /* UNIX */ void (*tclGetAndDetachPids) (Tcl_Interp * interp, Tcl_Channel chan); /* 0 */ @@ -447,15 +447,7 @@ typedef struct TclIntPlatStubs { } TclIntPlatStubs; #if defined(USE_TCL_STUBS) && !defined(USE_TCL_STUB_PROCS) - -#ifdef __cplusplus -extern "C" { -#endif -extern TclIntPlatStubs *tclIntPlatStubsPtr; -#ifdef __cplusplus -} -#endif - +EXTERN CONST TclIntPlatStubs *tclIntPlatStubsPtr; #endif /* defined(USE_TCL_STUBS) && !defined(USE_TCL_STUB_PROCS) */ #if defined(USE_TCL_STUBS) && !defined(USE_TCL_STUB_PROCS) diff --git a/generic/tclPlatDecls.h b/generic/tclPlatDecls.h index 1e695eb..028c816 100644 --- a/generic/tclPlatDecls.h +++ b/generic/tclPlatDecls.h @@ -6,7 +6,7 @@ * Copyright (c) 1998-1999 by Scriptics Corporation. * All rights reserved. * - * RCS: @(#) $Id: tclPlatDecls.h,v 1.28 2008/04/01 16:23:41 dgp Exp $ + * RCS: @(#) $Id: tclPlatDecls.h,v 1.29 2008/04/02 21:30:04 das Exp $ */ #ifndef _TCLPLATDECLS @@ -82,7 +82,7 @@ EXTERN int Tcl_MacOSXOpenVersionedBundleResources ( typedef struct TclPlatStubs { int magic; - struct TclPlatStubHooks *hooks; + CONST struct TclPlatStubHooks *hooks; #ifdef __WIN32__ /* WIN */ TCHAR * (*tcl_WinUtfToTChar) (CONST char * str, int len, Tcl_DString * dsPtr); /* 0 */ @@ -95,15 +95,7 @@ typedef struct TclPlatStubs { } TclPlatStubs; #if defined(USE_TCL_STUBS) && !defined(USE_TCL_STUB_PROCS) - -#ifdef __cplusplus -extern "C" { -#endif -extern TclPlatStubs *tclPlatStubsPtr; -#ifdef __cplusplus -} -#endif - +EXTERN CONST TclPlatStubs *tclPlatStubsPtr; #endif /* defined(USE_TCL_STUBS) && !defined(USE_TCL_STUB_PROCS) */ #if defined(USE_TCL_STUBS) && !defined(USE_TCL_STUB_PROCS) diff --git a/generic/tclStubInit.c b/generic/tclStubInit.c index f663610..b5f31ab 100644 --- a/generic/tclStubInit.c +++ b/generic/tclStubInit.c @@ -8,7 +8,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tclStubInit.c,v 1.150 2008/01/23 17:31:42 dgp Exp $ + * RCS: @(#) $Id: tclStubInit.c,v 1.151 2008/04/02 21:30:04 das Exp $ */ #include "tclInt.h" @@ -491,7 +491,7 @@ TclTomMathStubs tclTomMathStubs = { TclBN_s_mp_sub, /* 60 */ }; -static TclStubHooks tclStubHooks = { +static const TclStubHooks tclStubHooks = { &tclPlatStubs, &tclIntStubs, &tclIntPlatStubs diff --git a/generic/tclTomMathDecls.h b/generic/tclTomMathDecls.h index d12f199..094b1e5 100644 --- a/generic/tclTomMathDecls.h +++ b/generic/tclTomMathDecls.h @@ -11,7 +11,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tclTomMathDecls.h,v 1.3 2008/04/01 16:23:42 dgp Exp $ + * RCS: @(#) $Id: tclTomMathDecls.h,v 1.4 2008/04/02 21:30:04 das Exp $ */ #ifndef _TCLTOMMATHDECLS @@ -455,7 +455,7 @@ EXTERN int TclBN_s_mp_sub (mp_int* a, mp_int* b, mp_int* c); typedef struct TclTomMathStubs { int magic; - struct TclTomMathStubHooks *hooks; + CONST struct TclTomMathStubHooks *hooks; int (*tclBN_epoch) (void); /* 0 */ int (*tclBN_revision) (void); /* 1 */ @@ -521,15 +521,7 @@ typedef struct TclTomMathStubs { } TclTomMathStubs; #if defined(USE_TCL_STUBS) && !defined(USE_TCL_STUB_PROCS) - -#ifdef __cplusplus -extern "C" { -#endif -extern TclTomMathStubs *tclTomMathStubsPtr; -#ifdef __cplusplus -} -#endif - +EXTERN CONST TclTomMathStubs *tclTomMathStubsPtr; #endif /* defined(USE_TCL_STUBS) && !defined(USE_TCL_STUB_PROCS) */ #if defined(USE_TCL_STUBS) && !defined(USE_TCL_STUB_PROCS) -- cgit v0.12