diff options
| author | Kevin B Kenny <kennykb@acm.org> | 2008-04-08 03:28:04 (GMT) |
|---|---|---|
| committer | Kevin B Kenny <kennykb@acm.org> | 2008-04-08 03:28:04 (GMT) |
| commit | cf6cbd25cb59c0002784a0a740d36481be63abf8 (patch) | |
| tree | 6b13f877dafa6297111f43f00c7de9f4e8ccad2e /generic | |
| parent | 336c6a7ae7557bae330981e3ff138b77bd428bfd (diff) | |
| download | tk-cf6cbd25cb59c0002784a0a740d36481be63abf8.zip tk-cf6cbd25cb59c0002784a0a740d36481be63abf8.tar.gz tk-cf6cbd25cb59c0002784a0a740d36481be63abf8.tar.bz2 | |
* tkDecls.h: Reverted das's change of Tk's stubs pointers
* tkIntDecls.h: from 'extern' to 'EXTERN'. Since the stubs pointer
* tkPlatDecls.h: is always linked statically, its wrong to import
or export it from a DLL, and the change causes
trouble for extensions that build with -DUSE_TK_STUBS.
* tkWinEmbed.c: Removed #if 0 code. Trust the revision control system,
if you need it again, you can find it.
* tkWinSend.c: Added conditional compilation to silence several
compiler warnings.
Diffstat (limited to 'generic')
| -rw-r--r-- | generic/tkDecls.h | 9 | ||||
| -rw-r--r-- | generic/tkIntDecls.h | 4 | ||||
| -rw-r--r-- | generic/tkPlatDecls.h | 4 |
3 files changed, 11 insertions, 6 deletions
diff --git a/generic/tkDecls.h b/generic/tkDecls.h index c0e0ac5..250a3e0 100644 --- a/generic/tkDecls.h +++ b/generic/tkDecls.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: tkDecls.h,v 1.32 2008/04/02 21:32:32 das Exp $ + * RCS: @(#) $Id: tkDecls.h,v 1.33 2008/04/08 03:28:04 kennykb Exp $ */ #ifndef _TKDECLS @@ -1983,7 +1983,12 @@ typedef struct TkStubs { } TkStubs; #if defined(USE_TK_STUBS) && !defined(USE_TK_STUB_PROCS) -EXTERN CONST TkStubs *tkStubsPtr; +/* + * The following declaration has to be 'extern', not EXTERN. The + * stubs pointer is always static-linked, and never exported from + * a DLL. + */ +extern const TkStubs *tkStubsPtr; #endif /* defined(USE_TK_STUBS) && !defined(USE_TK_STUB_PROCS) */ #if defined(USE_TK_STUBS) && !defined(USE_TK_STUB_PROCS) diff --git a/generic/tkIntDecls.h b/generic/tkIntDecls.h index 3dc3cbf..d5f1266 100644 --- a/generic/tkIntDecls.h +++ b/generic/tkIntDecls.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: tkIntDecls.h,v 1.33 2008/04/02 21:32:32 das Exp $ + * RCS: @(#) $Id: tkIntDecls.h,v 1.34 2008/04/08 03:28:05 kennykb Exp $ */ #ifndef _TKINTDECLS @@ -1223,7 +1223,7 @@ typedef struct TkIntStubs { } TkIntStubs; #if defined(USE_TK_STUBS) && !defined(USE_TK_STUB_PROCS) -EXTERN CONST TkIntStubs *tkIntStubsPtr; +extern CONST TkIntStubs *tkIntStubsPtr; #endif /* defined(USE_TK_STUBS) && !defined(USE_TK_STUB_PROCS) */ #if defined(USE_TK_STUBS) && !defined(USE_TK_STUB_PROCS) diff --git a/generic/tkPlatDecls.h b/generic/tkPlatDecls.h index d1219cc..d2cc339 100644 --- a/generic/tkPlatDecls.h +++ b/generic/tkPlatDecls.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: tkPlatDecls.h,v 1.17 2008/04/02 21:32:33 das Exp $ + * RCS: @(#) $Id: tkPlatDecls.h,v 1.18 2008/04/08 03:28:05 kennykb Exp $ */ #ifndef _TKPLATDECLS @@ -157,7 +157,7 @@ typedef struct TkPlatStubs { } TkPlatStubs; #if defined(USE_TK_STUBS) && !defined(USE_TK_STUB_PROCS) -EXTERN CONST TkPlatStubs *tkPlatStubsPtr; +extern CONST TkPlatStubs *tkPlatStubsPtr; #endif /* defined(USE_TK_STUBS) && !defined(USE_TK_STUB_PROCS) */ #if defined(USE_TK_STUBS) && !defined(USE_TK_STUB_PROCS) |