diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2020-09-08 15:22:48 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2020-09-08 15:22:48 (GMT) |
| commit | d4daf4d9bef6d819c9cc65b9e5140dda427882ef (patch) | |
| tree | 606231b1d855dbdf32aba1ac9ce46b5d90a85e93 | |
| parent | 95aa66aaac53bd1a8b29fd542ec754556343c7a9 (diff) | |
| parent | 1a994da88e43dfeb7fd04825dd7552fe775efb80 (diff) | |
| download | tk-d4daf4d9bef6d819c9cc65b9e5140dda427882ef.zip tk-d4daf4d9bef6d819c9cc65b9e5140dda427882ef.tar.gz tk-d4daf4d9bef6d819c9cc65b9e5140dda427882ef.tar.bz2 | |
Merge 8.5
| -rw-r--r-- | .travis.yml | 8 | ||||
| -rw-r--r-- | generic/tk.decls | 2 | ||||
| -rw-r--r-- | generic/tkDecls.h | 21 | ||||
| -rw-r--r-- | generic/tkStubInit.c | 7 |
4 files changed, 29 insertions, 9 deletions
diff --git a/.travis.yml b/.travis.yml index 95c0727..bac76c1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -112,7 +112,7 @@ jobs: - BUILD_DIR=unix - CFGOPT="--enable-symbols" # Testing on Mac, various styles - - name: "macOS/Clang/Xcode 11.6/Shared" + - name: "macOS/Clang/Xcode 11.7/Shared" os: osx osx_image: xcode11.7 env: @@ -122,7 +122,7 @@ jobs: - ./configure ${CFGOPT} "--prefix=$HOME" || (cat config.log && exit 1) script: &mactest - make binaries libraries tktest - - name: "macOS/Clang/Xcode 11.6/Static" + - name: "macOS/Clang/Xcode 11.7/Static" os: osx osx_image: xcode11.7 env: @@ -131,7 +131,7 @@ jobs: install: - ./configure ${CFGOPT} "--prefix=$HOME" || (cat config.log && exit 1) script: *mactest - - name: "macOS/Clang/Xcode 11.6/Debug" + - name: "macOS/Clang/Xcode 11.7/Debug" os: osx osx_image: xcode11.7 env: @@ -140,7 +140,7 @@ jobs: install: - ./configure ${CFGOPT} "--prefix=$HOME" || (cat config.log && exit 1) script: *mactest - - name: "macOS/Clang/Xcode 11.6/Shared/XQuartz" + - name: "macOS/Clang/Xcode 11.7/Shared/XQuartz" os: osx osx_image: xcode11.7 env: diff --git a/generic/tk.decls b/generic/tk.decls index 71bd066..e891dbb 100644 --- a/generic/tk.decls +++ b/generic/tk.decls @@ -1068,7 +1068,7 @@ declare 272 { declare 273 { void Tk_CreateOldPhotoImageFormat(const Tk_PhotoImageFormat *formatPtr) } -declare 275 { +declare 280 { void TkUnusedStubEntry(void) } diff --git a/generic/tkDecls.h b/generic/tkDecls.h index f9c9772..87bb218 100644 --- a/generic/tkDecls.h +++ b/generic/tkDecls.h @@ -865,7 +865,12 @@ EXTERN void Tk_CreateOldImageType(const Tk_ImageType *typePtr); EXTERN void Tk_CreateOldPhotoImageFormat( const Tk_PhotoImageFormat *formatPtr); /* Slot 274 is reserved */ -/* 275 */ +/* Slot 275 is reserved */ +/* Slot 276 is reserved */ +/* Slot 277 is reserved */ +/* Slot 278 is reserved */ +/* Slot 279 is reserved */ +/* 280 */ EXTERN void TkUnusedStubEntry(void); typedef struct { @@ -1154,7 +1159,12 @@ typedef struct TkStubs { void (*tk_CreateOldImageType) (const Tk_ImageType *typePtr); /* 272 */ void (*tk_CreateOldPhotoImageFormat) (const Tk_PhotoImageFormat *formatPtr); /* 273 */ void (*reserved274)(void); - void (*tkUnusedStubEntry) (void); /* 275 */ + void (*reserved275)(void); + void (*reserved276)(void); + void (*reserved277)(void); + void (*reserved278)(void); + void (*reserved279)(void); + void (*tkUnusedStubEntry) (void); /* 280 */ } TkStubs; extern const TkStubs *tkStubsPtr; @@ -1716,8 +1726,13 @@ extern const TkStubs *tkStubsPtr; #define Tk_CreateOldPhotoImageFormat \ (tkStubsPtr->tk_CreateOldPhotoImageFormat) /* 273 */ /* Slot 274 is reserved */ +/* Slot 275 is reserved */ +/* Slot 276 is reserved */ +/* Slot 277 is reserved */ +/* Slot 278 is reserved */ +/* Slot 279 is reserved */ #define TkUnusedStubEntry \ - (tkStubsPtr->tkUnusedStubEntry) /* 275 */ + (tkStubsPtr->tkUnusedStubEntry) /* 280 */ #endif /* defined(USE_TK_STUBS) */ diff --git a/generic/tkStubInit.c b/generic/tkStubInit.c index ee79926..cfca9ca 100644 --- a/generic/tkStubInit.c +++ b/generic/tkStubInit.c @@ -1327,7 +1327,12 @@ const TkStubs tkStubs = { Tk_CreateOldImageType, /* 272 */ Tk_CreateOldPhotoImageFormat, /* 273 */ 0, /* 274 */ - TkUnusedStubEntry, /* 275 */ + 0, /* 275 */ + 0, /* 276 */ + 0, /* 277 */ + 0, /* 278 */ + 0, /* 279 */ + TkUnusedStubEntry, /* 280 */ }; /* !END!: Do not edit above this line. */ |