diff options
-rwxr-xr-x[-rw-r--r--] | compat/zlib/win32/zlib1.dll | bin | 107520 -> 107520 bytes | |||
-rwxr-xr-x[-rw-r--r--] | compat/zlib/win64/zlib1.dll | bin | 112640 -> 112640 bytes | |||
-rwxr-xr-x[-rw-r--r--] | generic/tclDecls.h | 8 | ||||
-rwxr-xr-x[-rw-r--r--] | generic/tclIntDecls.h | 8 | ||||
-rwxr-xr-x[-rw-r--r--] | generic/tclIntPlatDecls.h | 8 | ||||
-rwxr-xr-x[-rw-r--r--] | generic/tclOODecls.h | 8 | ||||
-rwxr-xr-x[-rw-r--r--] | generic/tclOOIntDecls.h | 8 | ||||
-rwxr-xr-x[-rw-r--r--] | generic/tclOOStubInit.c | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | generic/tclPlatDecls.h | 8 | ||||
-rwxr-xr-x[-rw-r--r--] | generic/tclStubInit.c | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | generic/tclTomMathDecls.h | 8 | ||||
-rw-r--r-- | tools/genStubs.tcl | 5 |
12 files changed, 38 insertions, 23 deletions
diff --git a/compat/zlib/win32/zlib1.dll b/compat/zlib/win32/zlib1.dll Binary files differindex 9ea38d5..9ea38d5 100644..100755 --- a/compat/zlib/win32/zlib1.dll +++ b/compat/zlib/win32/zlib1.dll diff --git a/compat/zlib/win64/zlib1.dll b/compat/zlib/win64/zlib1.dll Binary files differindex bd1dbc6..bd1dbc6 100644..100755 --- a/compat/zlib/win64/zlib1.dll +++ b/compat/zlib/win64/zlib1.dll diff --git a/generic/tclDecls.h b/generic/tclDecls.h index 6a71ff2..7a000c5 100644..100755 --- a/generic/tclDecls.h +++ b/generic/tclDecls.h @@ -20,6 +20,10 @@ /* !BEGIN!: Do not edit below this line. */ +#ifdef __cplusplus +extern "C" { +#endif + /* * Exported function declarations: */ @@ -2396,10 +2400,8 @@ typedef struct TclStubs { void (*tcl_ZlibStreamSetCompressionDictionary) (Tcl_ZlibStream zhandle, Tcl_Obj *compressionDictionaryObj); /* 630 */ } TclStubs; -#ifdef __cplusplus -extern "C" { -#endif extern const TclStubs *tclStubsPtr; + #ifdef __cplusplus } #endif diff --git a/generic/tclIntDecls.h b/generic/tclIntDecls.h index fce4dbb..286f318 100644..100755 --- a/generic/tclIntDecls.h +++ b/generic/tclIntDecls.h @@ -25,6 +25,10 @@ /* !BEGIN!: Do not edit below this line. */ +#ifdef __cplusplus +extern "C" { +#endif + /* * Exported function declarations: */ @@ -800,10 +804,8 @@ typedef struct TclIntStubs { void (*tclSetSlaveCancelFlags) (Tcl_Interp *interp, int flags, int force); /* 250 */ } TclIntStubs; -#ifdef __cplusplus -extern "C" { -#endif extern const TclIntStubs *tclIntStubsPtr; + #ifdef __cplusplus } #endif diff --git a/generic/tclIntPlatDecls.h b/generic/tclIntPlatDecls.h index 4424c7c..7981da1 100644..100755 --- a/generic/tclIntPlatDecls.h +++ b/generic/tclIntPlatDecls.h @@ -21,6 +21,10 @@ /* !BEGIN!: Do not edit below this line. */ +#ifdef __cplusplus +extern "C" { +#endif + /* * Exported function declarations: */ @@ -327,10 +331,8 @@ typedef struct TclIntPlatStubs { #endif /* MACOSX */ } TclIntPlatStubs; -#ifdef __cplusplus -extern "C" { -#endif extern const TclIntPlatStubs *tclIntPlatStubsPtr; + #ifdef __cplusplus } #endif diff --git a/generic/tclOODecls.h b/generic/tclOODecls.h index b93865e..1d71359 100644..100755 --- a/generic/tclOODecls.h +++ b/generic/tclOODecls.h @@ -15,6 +15,10 @@ /* !BEGIN!: Do not edit below this line. */ +#ifdef __cplusplus +extern "C" { +#endif + /* * Exported function declarations: */ @@ -147,10 +151,8 @@ typedef struct TclOOStubs { Tcl_Obj * (*tcl_GetObjectName) (Tcl_Interp *interp, Tcl_Object object); /* 28 */ } TclOOStubs; -#ifdef __cplusplus -extern "C" { -#endif extern const TclOOStubs *tclOOStubsPtr; + #ifdef __cplusplus } #endif diff --git a/generic/tclOOIntDecls.h b/generic/tclOOIntDecls.h index faabf63..74a8d81 100644..100755 --- a/generic/tclOOIntDecls.h +++ b/generic/tclOOIntDecls.h @@ -7,6 +7,10 @@ /* !BEGIN!: Do not edit below this line. */ +#ifdef __cplusplus +extern "C" { +#endif + /* * Exported function declarations: */ @@ -110,10 +114,8 @@ typedef struct TclOOIntStubs { void (*tclOOClassSetMixins) (Tcl_Interp *interp, Class *classPtr, int numMixins, Class *const *mixins); /* 15 */ } TclOOIntStubs; -#ifdef __cplusplus -extern "C" { -#endif extern const TclOOIntStubs *tclOOIntStubsPtr; + #ifdef __cplusplus } #endif diff --git a/generic/tclOOStubInit.c b/generic/tclOOStubInit.c index 7be341a..7be341a 100644..100755 --- a/generic/tclOOStubInit.c +++ b/generic/tclOOStubInit.c diff --git a/generic/tclPlatDecls.h b/generic/tclPlatDecls.h index 4e6f29fa..ebb9991 100644..100755 --- a/generic/tclPlatDecls.h +++ b/generic/tclPlatDecls.h @@ -31,6 +31,10 @@ /* !BEGIN!: Do not edit below this line. */ +#ifdef __cplusplus +extern "C" { +#endif + /* * Exported function declarations: */ @@ -70,10 +74,8 @@ typedef struct TclPlatStubs { #endif /* MACOSX */ } TclPlatStubs; -#ifdef __cplusplus -extern "C" { -#endif extern const TclPlatStubs *tclPlatStubsPtr; + #ifdef __cplusplus } #endif diff --git a/generic/tclStubInit.c b/generic/tclStubInit.c index b430456..b430456 100644..100755 --- a/generic/tclStubInit.c +++ b/generic/tclStubInit.c diff --git a/generic/tclTomMathDecls.h b/generic/tclTomMathDecls.h index b6dec32..66b149a 100644..100755 --- a/generic/tclTomMathDecls.h +++ b/generic/tclTomMathDecls.h @@ -123,6 +123,10 @@ /* !BEGIN!: Do not edit below this line. */ +#ifdef __cplusplus +extern "C" { +#endif + /* * Exported function declarations: */ @@ -335,10 +339,8 @@ typedef struct TclTomMathStubs { int (*tclBN_mp_cnt_lsb) (const mp_int *a); /* 63 */ } TclTomMathStubs; -#ifdef __cplusplus -extern "C" { -#endif extern const TclTomMathStubs *tclTomMathStubsPtr; + #ifdef __cplusplus } #endif diff --git a/tools/genStubs.tcl b/tools/genStubs.tcl index 6ce4243..c12568b 100644 --- a/tools/genStubs.tcl +++ b/tools/genStubs.tcl @@ -983,6 +983,8 @@ proc genStubs::emitHeader {name} { append text "#define ${CAPName}_STUBS_REVISION $revision\n" } + append text "\n#ifdef __cplusplus\nextern \"C\" {\n#endif\n" + emitDeclarations $name text if {[info exists hooks($name)]} { @@ -1010,8 +1012,7 @@ proc genStubs::emitHeader {name} { append text "} ${capName}Stubs;\n\n" - append text "#ifdef __cplusplus\nextern \"C\" {\n#endif\n" - append text "extern const ${capName}Stubs *${name}StubsPtr;\n" + append text "extern const ${capName}Stubs *${name}StubsPtr;\n\n" append text "#ifdef __cplusplus\n}\n#endif\n" emitMacros $name text |