Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
Comment: | On Cygwin, use win32 API in stead of uname() to determine the tcl_platform variables |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | core-8-4-branch |
Files: | files | file ages | folders |
SHA1: |
399d1126efce4d9c130d089a4b138875 |
User & Date: | jan.nijtmans 2012-06-06 12:43:57 |
Context
2012-06-08
| ||
13:04 | Update autogoo for gettimeofday(). Thanks Joe English. check-in: f6e87a9442 user: dgp tags: core-8-4-branch | |
2012-06-06
| ||
13:02 | On Cygwin, use win32 API in stead of uname() to determine the tcl_platform variables check-in: b60f48db3f user: jan.nijtmans tags: core-8-5-branch | |
12:43 | On Cygwin, use win32 API in stead of uname() to determine the tcl_platform variables check-in: 399d1126ef user: jan.nijtmans tags: core-8-4-branch | |
2012-05-25
| ||
07:24 | [Bug 473946]: special characters not correctly sent, now for XTYP_EXECUTE as well as XTYP_REQUEST. ... check-in: 7ebfab5576 user: jan.nijtmans tags: core-8-4-branch | |
Changes
Changes to ChangeLog.
1 2 3 4 5 6 7 | 2012-05-25 Jan Nijtmans <[email protected]> * win/tclWinDde.c: [Bug 473946]: special characters not correctly sent, now for XTYP_EXECUTE as well as XTYP_REQUEST. * win/Makefile.in: Fix "make genstubs" when cross-compiling on UNIX 2012-05-24 Jan Nijtmans <[email protected]> | > > > > > | 1 2 3 4 5 6 7 8 9 10 11 12 | 2012-06-06 Jan Nijtmans <[email protected]> * unix/tclUnixInit.c: On Cygwin, use win32 API in stead of uname() to determine the tcl_platform variables. 2012-05-25 Jan Nijtmans <[email protected]> * win/tclWinDde.c: [Bug 473946]: special characters not correctly sent, now for XTYP_EXECUTE as well as XTYP_REQUEST. * win/Makefile.in: Fix "make genstubs" when cross-compiling on UNIX 2012-05-24 Jan Nijtmans <[email protected]> |
︙ | ︙ |
Changes to generic/tcl.decls.
︙ | ︙ | |||
1818 1819 1820 1821 1822 1823 1824 | char *Tcl_WinTCharToUtf(const TCHAR *str, int len, Tcl_DString *dsPtr) } ################## # Mac declarations # This is needed by the shells to handle Macintosh events. | | | | 1818 1819 1820 1821 1822 1823 1824 1825 1826 1827 1828 1829 1830 1831 1832 1833 1834 1835 1836 1837 | char *Tcl_WinTCharToUtf(const TCHAR *str, int len, Tcl_DString *dsPtr) } ################## # Mac declarations # This is needed by the shells to handle Macintosh events. declare 0 mac { void Tcl_MacSetEventProc(Tcl_MacConvertEventPtr procPtr) } # These routines are useful for handling using scripts from resources # in the application shell declare 1 mac { char *Tcl_MacConvertTextResource(Handle resource) } declare 2 mac { int Tcl_MacEvalResource(Tcl_Interp *interp, const char *resourceName, |
︙ | ︙ | |||
1855 1856 1857 1858 1859 1860 1861 | } declare 6 mac { Tcl_Obj *Tcl_NewOSTypeObj(OSType osType) } # These are not in MSL 2.1.2, so we need to export them from the # Tcl shared library. They are found in the compat directory. | | | 1855 1856 1857 1858 1859 1860 1861 1862 1863 1864 1865 1866 1867 1868 1869 | } declare 6 mac { Tcl_Obj *Tcl_NewOSTypeObj(OSType osType) } # These are not in MSL 2.1.2, so we need to export them from the # Tcl shared library. They are found in the compat directory. declare 7 mac { int strncasecmp(const char *s1, const char *s2, size_t n) } declare 8 mac { int strcasecmp(const char *s1, const char *s2) } |
︙ | ︙ |
Changes to generic/tclInt.decls.
︙ | ︙ | |||
795 796 797 798 799 800 801 | } declare 19 mac { int TclMacTimerExpired(void *timerToken) } declare 20 mac { int TclMacRegisterResourceFork(short fileRef, Tcl_Obj *tokenPtr, int insert) | | | | 795 796 797 798 799 800 801 802 803 804 805 806 807 808 809 810 811 812 | } declare 19 mac { int TclMacTimerExpired(void *timerToken) } declare 20 mac { int TclMacRegisterResourceFork(short fileRef, Tcl_Obj *tokenPtr, int insert) } declare 21 mac { short TclMacUnRegisterResourceFork(char *tokenPtr, Tcl_Obj *resultPtr) } declare 22 mac { int TclMacCreateEnv(void) } declare 23 mac { FILE *TclMacFOpenHack(const char *path, const char *mode) } # Replaced in 8.1 by TclpReadLink: |
︙ | ︙ |
Changes to unix/tclUnixInit.c.
︙ | ︙ | |||
29 30 31 32 33 34 35 36 37 38 39 40 41 42 | #endif #if defined(__bsdi__) # include <sys/param.h> # if _BSDI_VERSION > 199501 # include <dlfcn.h> # endif #endif /* * The Init script (common to Windows and Unix platforms) is * defined in tkInitScript.h */ #include "tclInitScript.h" | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 | #endif #if defined(__bsdi__) # include <sys/param.h> # if _BSDI_VERSION > 199501 # include <dlfcn.h> # endif #endif #ifdef __CYGWIN__ DLLIMPORT extern __stdcall unsigned char GetVersionExA(void *); DLLIMPORT extern __stdcall void GetSystemInfo(void *); #define NUMPLATFORMS 4 static const char *const platforms[NUMPLATFORMS] = { "Win32s", "Windows 95", "Windows NT", "Windows CE" }; #define NUMPROCESSORS 11 static const char *const processors[NUMPROCESSORS] = { "intel", "mips", "alpha", "ppc", "shx", "arm", "ia64", "alpha64", "msil", "amd64", "ia32_on_win64" }; typedef struct _SYSTEM_INFO { union { DWORD dwOemId; struct { int wProcessorArchitecture; int wReserved; }; }; DWORD dwPageSize; void *lpMinimumApplicationAddress; void *lpMaximumApplicationAddress; void *dwActiveProcessorMask; DWORD dwNumberOfProcessors; DWORD dwProcessorType; DWORD dwAllocationGranularity; int wProcessorLevel; int wProcessorRevision; } SYSTEM_INFO; typedef struct _OSVERSIONINFOA { DWORD dwOSVersionInfoSize; DWORD dwMajorVersion; DWORD dwMinorVersion; DWORD dwBuildNumber; DWORD dwPlatformId; char szCSDVersion[128]; } OSVERSIONINFOA; #endif /* * The Init script (common to Windows and Unix platforms) is * defined in tkInitScript.h */ #include "tclInitScript.h" |
︙ | ︙ | |||
770 771 772 773 774 775 776 | *---------------------------------------------------------------------- */ void TclpSetVariables(interp) Tcl_Interp *interp; { | > > > > | | 815 816 817 818 819 820 821 822 823 824 825 826 827 828 829 830 831 832 833 | *---------------------------------------------------------------------- */ void TclpSetVariables(interp) Tcl_Interp *interp; { #ifdef __CYGWIN__ SYSTEM_INFO sysInfo; OSVERSIONINFOA osInfo; char buffer[TCL_INTEGER_SPACE * 2]; #elif !defined(NO_UNAME) struct utsname name; #endif int unameOK; CONST char *user; Tcl_DString ds; #ifdef HAVE_COREFOUNDATION |
︙ | ︙ | |||
872 873 874 875 876 877 878 | #ifdef DJGPP Tcl_SetVar2(interp, "tcl_platform", "platform", "dos", TCL_GLOBAL_ONLY); #else Tcl_SetVar2(interp, "tcl_platform", "platform", "unix", TCL_GLOBAL_ONLY); #endif unameOK = 0; | > > > > > > > > > > > > > > > > > > | | 921 922 923 924 925 926 927 928 929 930 931 932 933 934 935 936 937 938 939 940 941 942 943 944 945 946 947 948 949 950 951 952 953 | #ifdef DJGPP Tcl_SetVar2(interp, "tcl_platform", "platform", "dos", TCL_GLOBAL_ONLY); #else Tcl_SetVar2(interp, "tcl_platform", "platform", "unix", TCL_GLOBAL_ONLY); #endif unameOK = 0; #ifdef __CYGWIN__ unameOK = 1; osInfo.dwOSVersionInfoSize = sizeof(OSVERSIONINFOA); GetVersionExA(&osInfo); GetSystemInfo(&sysInfo); if (osInfo.dwPlatformId < NUMPLATFORMS) { Tcl_SetVar2(interp, "tcl_platform", "os", platforms[osInfo.dwPlatformId], TCL_GLOBAL_ONLY); } sprintf(buffer, "%d.%d", osInfo.dwMajorVersion, osInfo.dwMinorVersion); Tcl_SetVar2(interp, "tcl_platform", "osVersion", buffer, TCL_GLOBAL_ONLY); if (sysInfo.wProcessorArchitecture < NUMPROCESSORS) { Tcl_SetVar2(interp, "tcl_platform", "machine", processors[sysInfo.wProcessorArchitecture], TCL_GLOBAL_ONLY); } #elif !defined NO_UNAME if (uname(&name) >= 0) { CONST char *native; unameOK = 1; native = Tcl_ExternalToUtfDString(NULL, name.sysname, -1, &ds); Tcl_SetVar2(interp, "tcl_platform", "os", native, TCL_GLOBAL_ONLY); |
︙ | ︙ |