diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2019-08-02 12:15:23 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2019-08-02 12:15:23 (GMT) |
| commit | 474d95712ea623f7cccf704be60d713aa2ebe309 (patch) | |
| tree | bd8e84a71e7799de0d39a19caa754821d7da2926 /unix/tclUnixInit.c | |
| parent | 2a3d586a796e62f522303b3ab71c84743a73bf89 (diff) | |
| parent | adbd7d18869a4d99a25188fad9c3bbf55d072980 (diff) | |
| download | tcl-474d95712ea623f7cccf704be60d713aa2ebe309.zip tcl-474d95712ea623f7cccf704be60d713aa2ebe309.tar.gz tcl-474d95712ea623f7cccf704be60d713aa2ebe309.tar.bz2 | |
Merge 8.7. Continue implementation for win32
Diffstat (limited to 'unix/tclUnixInit.c')
| -rw-r--r-- | unix/tclUnixInit.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/unix/tclUnixInit.c b/unix/tclUnixInit.c index 7406991..e26e657 100644 --- a/unix/tclUnixInit.c +++ b/unix/tclUnixInit.c @@ -33,11 +33,17 @@ #endif #ifdef __CYGWIN__ +#ifdef __cplusplus +extern "C" { +#endif DLLIMPORT extern __stdcall unsigned char GetVersionExW(void *); DLLIMPORT extern __stdcall void *GetModuleHandleW(const void *); DLLIMPORT extern __stdcall void FreeLibrary(void *); DLLIMPORT extern __stdcall void *GetProcAddress(void *, const char *); DLLIMPORT extern __stdcall void GetSystemInfo(void *); +#ifdef __cplusplus +} +#endif #define NUMPROCESSORS 11 static const char *const processors[NUMPROCESSORS] = { @@ -411,7 +417,7 @@ TclpInitPlatform(void) /* * In case the initial locale is not "C", ensure that the numeric * processing is done in "C" locale regardless. This is needed because Tcl - * relies on routines like strtod, but should not have locale dependent + * relies on routines like strtol/strtoul, but should not have locale dependent * behavior. */ @@ -1001,7 +1007,7 @@ TclpFindVariable( * searches). */ { int i, result = -1; - register const char *env, *p1, *p2; + const char *env, *p1, *p2; Tcl_DString envString; Tcl_DStringInit(&envString); |