diff options
| author | dgp <dgp@users.sourceforge.net> | 2013-04-01 17:07:10 (GMT) |
|---|---|---|
| committer | dgp <dgp@users.sourceforge.net> | 2013-04-01 17:07:10 (GMT) |
| commit | d81f8f7c49270ddc93b4d639c0e7f77767c4fd47 (patch) | |
| tree | 64da754277b242dc50862f735d5b4ee523971fa6 /generic/tkIntDecls.h | |
| parent | e19cf65c7641a093a5c7cf8325c5466e431d7c69 (diff) | |
| parent | b8f8082aad49088238582658c22248f9469ad055 (diff) | |
| download | tk-d81f8f7c49270ddc93b4d639c0e7f77767c4fd47.zip tk-d81f8f7c49270ddc93b4d639c0e7f77767c4fd47.tar.gz tk-d81f8f7c49270ddc93b4d639c0e7f77767c4fd47.tar.bz2 | |
Merge 8.5. Bring together the compile time and run time Xkb checks.bug_3607830
Diffstat (limited to 'generic/tkIntDecls.h')
| -rw-r--r-- | generic/tkIntDecls.h | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/generic/tkIntDecls.h b/generic/tkIntDecls.h index 5fcce30..063301d 100644 --- a/generic/tkIntDecls.h +++ b/generic/tkIntDecls.h @@ -962,6 +962,14 @@ EXTERN char * TkSmoothPrintProc(ClientData clientData, Tk_Window tkwin, char *widgRec, int offset, Tcl_FreeProc **freeProcPtr); #endif +/* Slot 181 is reserved */ +/* Slot 182 is reserved */ +/* Slot 183 is reserved */ +#ifndef TkUnusedStubEntry_TCL_DECLARED +#define TkUnusedStubEntry_TCL_DECLARED +/* 184 */ +EXTERN void TkUnusedStubEntry(void); +#endif typedef struct TkIntStubs { int magic; @@ -1175,6 +1183,10 @@ typedef struct TkIntStubs { char * (*tkOrientPrintProc) (ClientData clientData, Tk_Window tkwin, char *widgRec, int offset, Tcl_FreeProc **freeProcPtr); /* 178 */ int (*tkSmoothParseProc) (ClientData clientData, Tcl_Interp *interp, Tk_Window tkwin, CONST char *value, char *widgRec, int offset); /* 179 */ char * (*tkSmoothPrintProc) (ClientData clientData, Tk_Window tkwin, char *widgRec, int offset, Tcl_FreeProc **freeProcPtr); /* 180 */ + VOID *reserved181; + VOID *reserved182; + VOID *reserved183; + void (*tkUnusedStubEntry) (void); /* 184 */ } TkIntStubs; #ifdef __cplusplus @@ -1846,6 +1858,13 @@ extern TkIntStubs *tkIntStubsPtr; #define TkSmoothPrintProc \ (tkIntStubsPtr->tkSmoothPrintProc) /* 180 */ #endif +/* Slot 181 is reserved */ +/* Slot 182 is reserved */ +/* Slot 183 is reserved */ +#ifndef TkUnusedStubEntry +#define TkUnusedStubEntry \ + (tkIntStubsPtr->tkUnusedStubEntry) /* 184 */ +#endif #endif /* defined(USE_TK_STUBS) && !defined(USE_TK_STUB_PROCS) */ @@ -1881,6 +1900,7 @@ extern TkIntStubs *tkIntStubsPtr; (Region) (src), (Region) (ret)) #endif /* !__CYGWIN__*/ +#undef TkUnusedStubEntry #if defined(__CYGWIN__) && defined(USE_TK_STUBS) && !defined(USE_TK_STUB_PROCS) # undef TkBindDeadWindow # define TkBindDeadWindow(winPtr) /* Removed from Cygwins stub table, just do nothing */ |