summaryrefslogtreecommitdiffstats
path: root/generic/tclIntPlatDecls.h
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2018-01-10 14:33:54 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2018-01-10 14:33:54 (GMT)
commitd34c6b6526e8bb7c96736c2ef47422357e68c8d9 (patch)
tree2f91c61ee4dc1339e052647b0469b35c54f7f768 /generic/tclIntPlatDecls.h
parentb40ed15606db487315736beef3d23679445b122e (diff)
parent48d6a20861f95be856bef0e780c054757c9c3803 (diff)
downloadtcl-d34c6b6526e8bb7c96736c2ef47422357e68c8d9.zip
tcl-d34c6b6526e8bb7c96736c2ef47422357e68c8d9.tar.gz
tcl-d34c6b6526e8bb7c96736c2ef47422357e68c8d9.tar.bz2
merge core-8-branch
Diffstat (limited to 'generic/tclIntPlatDecls.h')
-rw-r--r--generic/tclIntPlatDecls.h12
1 files changed, 7 insertions, 5 deletions
diff --git a/generic/tclIntPlatDecls.h b/generic/tclIntPlatDecls.h
index ff336e6..54c35de 100644
--- a/generic/tclIntPlatDecls.h
+++ b/generic/tclIntPlatDecls.h
@@ -154,8 +154,7 @@ EXTERN char * TclWinNoBackslash(char *path);
/* Slot 26 is reserved */
/* 27 */
EXTERN void TclWinFlushDirtyChannels(void);
-/* 28 */
-EXTERN void TclWinResetInterfaces(void);
+/* Slot 28 is reserved */
/* 29 */
EXTERN int TclWinCPUID(int index, int *regs);
/* 30 */
@@ -300,7 +299,7 @@ typedef struct TclIntPlatStubs {
void (*reserved25)(void);
void (*reserved26)(void);
void (*tclWinFlushDirtyChannels) (void); /* 27 */
- void (*tclWinResetInterfaces) (void); /* 28 */
+ void (*reserved28)(void);
int (*tclWinCPUID) (int index, int *regs); /* 29 */
int (*tclUnixOpenTemporaryFile) (Tcl_Obj *dirObj, Tcl_Obj *basenameObj, Tcl_Obj *extensionObj, Tcl_Obj *resultingNameObj); /* 30 */
#endif /* WIN */
@@ -442,8 +441,7 @@ extern const TclIntPlatStubs *tclIntPlatStubsPtr;
/* Slot 26 is reserved */
#define TclWinFlushDirtyChannels \
(tclIntPlatStubsPtr->tclWinFlushDirtyChannels) /* 27 */
-#define TclWinResetInterfaces \
- (tclIntPlatStubsPtr->tclWinResetInterfaces) /* 28 */
+/* Slot 28 is reserved */
#define TclWinCPUID \
(tclIntPlatStubsPtr->tclWinCPUID) /* 29 */
#define TclUnixOpenTemporaryFile \
@@ -508,6 +506,10 @@ extern const TclIntPlatStubs *tclIntPlatStubsPtr;
#define TCL_STORAGE_CLASS DLLIMPORT
#define TclWinGetPlatformId() (2) /* VER_PLATFORM_WIN32_NT */
#define TclWinConvertWSAError TclWinConvertError
+#undef TclWinResetInterfaces
+#define TclWinResetInterfaces() /* nop */
+#undef TclWinSetInterfaces
+#define TclWinSetInterfaces(dummy) /* nop */
#if !defined(_WIN32)
# undef TclpGetPid