diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2017-12-09 16:13:58 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2017-12-09 16:13:58 (GMT) |
| commit | 5b605792cb9aa4524f0c4b740fd064b294ae667c (patch) | |
| tree | 12182b3fedf67b6f4566aaafe763332f92a9c70e /generic | |
| parent | 5724764152674f9acd59a52633e5525567ba84b5 (diff) | |
| parent | 9ef7f0a940cdff5f1a7f0b8b77f82a10cae105f2 (diff) | |
| download | tcl-5b605792cb9aa4524f0c4b740fd064b294ae667c.zip tcl-5b605792cb9aa4524f0c4b740fd064b294ae667c.tar.gz tcl-5b605792cb9aa4524f0c4b740fd064b294ae667c.tar.bz2 | |
merge core-8-branch.
Remove stub entry for TclWinGetPlatformId(), as it is no longer needed. Is a macro now.
Diffstat (limited to 'generic')
| -rw-r--r-- | generic/tclInt.decls | 7 | ||||
| -rw-r--r-- | generic/tclIntPlatDecls.h | 9 | ||||
| -rw-r--r-- | generic/tclStubInit.c | 3 |
3 files changed, 9 insertions, 10 deletions
diff --git a/generic/tclInt.decls b/generic/tclInt.decls index ad48007..28f2764 100644 --- a/generic/tclInt.decls +++ b/generic/tclInt.decls @@ -1103,9 +1103,10 @@ declare 5 win { declare 8 win { int TclpGetPid(Tcl_Pid pid) } -declare 9 win { - int TclWinGetPlatformId(void) -} +# Removed in 9.0: +#declare 9 win { +# int TclWinGetPlatformId(void) +#} # Removed in 9.0: #declare 10 win { # Tcl_DirEntry *TclpReaddir(DIR *dir) diff --git a/generic/tclIntPlatDecls.h b/generic/tclIntPlatDecls.h index 6da74f9..ff336e6 100644 --- a/generic/tclIntPlatDecls.h +++ b/generic/tclIntPlatDecls.h @@ -114,8 +114,7 @@ EXTERN int TclUnixWaitForFile(int fd, int mask, int timeout); /* Slot 7 is reserved */ /* 8 */ EXTERN int TclpGetPid(Tcl_Pid pid); -/* 9 */ -EXTERN int TclWinGetPlatformId(void); +/* Slot 9 is reserved */ /* Slot 10 is reserved */ /* 11 */ EXTERN void TclGetAndDetachPids(Tcl_Interp *interp, @@ -282,7 +281,7 @@ typedef struct TclIntPlatStubs { void (*reserved6)(void); void (*reserved7)(void); int (*tclpGetPid) (Tcl_Pid pid); /* 8 */ - int (*tclWinGetPlatformId) (void); /* 9 */ + void (*reserved9)(void); void (*reserved10)(void); void (*tclGetAndDetachPids) (Tcl_Interp *interp, Tcl_Channel chan); /* 11 */ int (*tclpCloseFile) (TclFile file); /* 12 */ @@ -411,8 +410,7 @@ extern const TclIntPlatStubs *tclIntPlatStubsPtr; /* Slot 7 is reserved */ #define TclpGetPid \ (tclIntPlatStubsPtr->tclpGetPid) /* 8 */ -#define TclWinGetPlatformId \ - (tclIntPlatStubsPtr->tclWinGetPlatformId) /* 9 */ +/* Slot 9 is reserved */ /* Slot 10 is reserved */ #define TclGetAndDetachPids \ (tclIntPlatStubsPtr->tclGetAndDetachPids) /* 11 */ @@ -508,6 +506,7 @@ extern const TclIntPlatStubs *tclIntPlatStubsPtr; #undef TCL_STORAGE_CLASS #define TCL_STORAGE_CLASS DLLIMPORT +#define TclWinGetPlatformId() (2) /* VER_PLATFORM_WIN32_NT */ #define TclWinConvertWSAError TclWinConvertError #if !defined(_WIN32) diff --git a/generic/tclStubInit.c b/generic/tclStubInit.c index 4ff8680..b0e6e89 100644 --- a/generic/tclStubInit.c +++ b/generic/tclStubInit.c @@ -44,7 +44,6 @@ #undef Tcl_SetIntObj #if defined(TCL_NO_DEPRECATED) || TCL_MAJOR_VERSION > 8 -# define TclWinGetPlatformId 0 # define TclBNInitBignumFromWideUInt 0 # define TclBNInitBignumFromWideInt 0 # define TclBNInitBignumFromLong 0 @@ -585,7 +584,7 @@ static const TclIntPlatStubs tclIntPlatStubs = { 0, /* 6 */ 0, /* 7 */ TclpGetPid, /* 8 */ - TclWinGetPlatformId, /* 9 */ + 0, /* 9 */ 0, /* 10 */ TclGetAndDetachPids, /* 11 */ TclpCloseFile, /* 12 */ |