diff options
| author | patthoyts <patthoyts@users.sourceforge.net> | 2009-07-02 10:34:32 (GMT) |
|---|---|---|
| committer | patthoyts <patthoyts@users.sourceforge.net> | 2009-07-02 10:34:32 (GMT) |
| commit | 1423263a3e8ae6a6aee0b27787b690779c4fee52 (patch) | |
| tree | 326975e605eef7f6d67709b181d327f61bbb8814 | |
| parent | e814abdc993285f2a35a00be2a89b45874d0598b (diff) | |
| download | tk-1423263a3e8ae6a6aee0b27787b690779c4fee52.zip tk-1423263a3e8ae6a6aee0b27787b690779c4fee52.tar.gz tk-1423263a3e8ae6a6aee0b27787b690779c4fee52.tar.bz2 | |
Avoid the use of C++ reserved words in headers [Bug2815625]
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | generic/tkInt.h | 4 |
2 files changed, 6 insertions, 2 deletions
@@ -1,3 +1,7 @@ +2009-07-02 Pat Thoyts <patthoyts@users.sourceforge.net> + + * generic/tkInt.h: Avoid using C++ reserved word in header. + 2009-06-30 Daniel Steffen <das@users.sourceforge.net> * generic/tkInt.h: add assert macros for clang static diff --git a/generic/tkInt.h b/generic/tkInt.h index b5072be..430d51e 100644 --- a/generic/tkInt.h +++ b/generic/tkInt.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: tkInt.h,v 1.105 2009/06/30 14:21:44 das Exp $ + * RCS: $Id: tkInt.h,v 1.106 2009/07/02 10:34:32 patthoyts Exp $ */ #ifndef _TKINT @@ -1235,7 +1235,7 @@ MODULE_SCOPE int TkBackgroundEvalObjv(Tcl_Interp *interp, int objc, Tcl_Obj *const *objv, int flags); MODULE_SCOPE void TkSendVirtualEvent(Tk_Window tgtWin, const char *eventName); MODULE_SCOPE Tcl_Command TkMakeEnsemble(Tcl_Interp *interp, - const char *namespace, const char *name, + const char *nsname, const char *name, ClientData clientData, const TkEnsemble *map); MODULE_SCOPE int TkInitTkCmd(Tcl_Interp *interp, ClientData clientData); |