summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordas <das>2008-04-08 15:00:36 (GMT)
committerdas <das>2008-04-08 15:00:36 (GMT)
commit3cc3f93973c2ef7c8b753e222d3e2012c75e3da7 (patch)
tree5daaa4e0c9a601e5a0d0ba1d47910a79589a1825
parentcf6cbd25cb59c0002784a0a740d36481be63abf8 (diff)
downloadtk-3cc3f93973c2ef7c8b753e222d3e2012c75e3da7.zip
tk-3cc3f93973c2ef7c8b753e222d3e2012c75e3da7.tar.gz
tk-3cc3f93973c2ef7c8b753e222d3e2012c75e3da7.tar.bz2
* generic/tkDecls.h: make genstubs (genStubs.tcl changes).
* generic/tkIntPlatDecls.h: * generic/tkIntXlibDecls.h:
-rw-r--r--ChangeLog14
-rw-r--r--generic/tkDecls.h9
-rw-r--r--generic/tkIntPlatDecls.h4
-rw-r--r--generic/tkIntXlibDecls.h4
4 files changed, 15 insertions, 16 deletions
diff --git a/ChangeLog b/ChangeLog
index 5d16c9b..0c6a696 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,12 +1,16 @@
+2008-04-08 Daniel Steffen <das@users.sourceforge.net>
+
+ * generic/tkDecls.h: make genstubs (genStubs.tcl changes).
+ * generic/tkIntDecls.h:
+ * generic/tkIntPlatDecls.h:
+ * generic/tkIntXlibDecls.h:
+ * generic/tkPlatDecls.h:
+
2008-04-08 Kevin Kenny <kennykb@acm.org>
- * 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.
diff --git a/generic/tkDecls.h b/generic/tkDecls.h
index 250a3e0..abf2739 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.33 2008/04/08 03:28:04 kennykb Exp $
+ * RCS: @(#) $Id: tkDecls.h,v 1.34 2008/04/08 15:00:37 das Exp $
*/
#ifndef _TKDECLS
@@ -1983,12 +1983,7 @@ typedef struct TkStubs {
} TkStubs;
#if defined(USE_TK_STUBS) && !defined(USE_TK_STUB_PROCS)
-/*
- * 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;
+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/tkIntPlatDecls.h b/generic/tkIntPlatDecls.h
index 84720fa..1d8c391 100644
--- a/generic/tkIntPlatDecls.h
+++ b/generic/tkIntPlatDecls.h
@@ -9,7 +9,7 @@
* Copyright (c) 1998-1999 by Scriptics Corporation.
* All rights reserved.
*
- * RCS: @(#) $Id: tkIntPlatDecls.h,v 1.31 2008/04/02 21:32:32 das Exp $
+ * RCS: @(#) $Id: tkIntPlatDecls.h,v 1.32 2008/04/08 15:00:43 das Exp $
*/
#ifndef _TKINTPLATDECLS
@@ -671,7 +671,7 @@ typedef struct TkIntPlatStubs {
} TkIntPlatStubs;
#if defined(USE_TK_STUBS) && !defined(USE_TK_STUB_PROCS)
-EXTERN CONST TkIntPlatStubs *tkIntPlatStubsPtr;
+extern CONST TkIntPlatStubs *tkIntPlatStubsPtr;
#endif /* defined(USE_TK_STUBS) && !defined(USE_TK_STUB_PROCS) */
#if defined(USE_TK_STUBS) && !defined(USE_TK_STUB_PROCS)
diff --git a/generic/tkIntXlibDecls.h b/generic/tkIntXlibDecls.h
index 2dae5b6..0a7974a 100644
--- a/generic/tkIntXlibDecls.h
+++ b/generic/tkIntXlibDecls.h
@@ -9,7 +9,7 @@
* Copyright (c) 1998-1999 by Scriptics Corporation.
* All rights reserved.
*
- * RCS: @(#) $Id: tkIntXlibDecls.h,v 1.25 2008/04/02 21:32:32 das Exp $
+ * RCS: @(#) $Id: tkIntXlibDecls.h,v 1.26 2008/04/08 15:00:47 das Exp $
*/
#ifndef _TKINTXLIBDECLS
@@ -1420,7 +1420,7 @@ typedef struct TkIntXlibStubs {
} TkIntXlibStubs;
#if defined(USE_TK_STUBS) && !defined(USE_TK_STUB_PROCS)
-EXTERN CONST TkIntXlibStubs *tkIntXlibStubsPtr;
+extern CONST TkIntXlibStubs *tkIntXlibStubsPtr;
#endif /* defined(USE_TK_STUBS) && !defined(USE_TK_STUB_PROCS) */
#if defined(USE_TK_STUBS) && !defined(USE_TK_STUB_PROCS)