Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
Comment: | Remove wrapper macro for ntohs(): unnecessary, because it doesn't require an initialized winsock_2 library |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA1: |
46096ee96acbd2f2d5c9bd742c4e7c8e |
User & Date: | jan.nijtmans 2012-08-20 09:12:39 |
Context
2012-08-20
| ||
23:50 | 3559678 Fix bad filename normalization when the last component is the empty string. check-in: ec32e3cc76 user: dgp tags: trunk | |
14:14 | merge trunk check-in: e6892c2563 user: dgp tags: core-8-6-b3-rc | |
09:12 | Remove wrapper macro for ntohs(): unnecessary, because it doesn't require an initialized winsock_2 l... check-in: 46096ee96a user: jan.nijtmans tags: trunk | |
09:01 | ... and don't forget ChangeLog entry check-in: 4000282abb user: jan.nijtmans tags: core-8-5-branch | |
2012-08-17
| ||
07:21 | nmakehlp: Add "-V<num>" option, in order to be able to detect partial version numbers. check-in: 7c90caa198 user: jan.nijtmans tags: trunk | |
Changes
Changes to ChangeLog.
1 2 3 4 5 6 7 | 2012-08-17 Jan Nijtmans <[email protected]> * win/nmakehlp.c: Add "-V<num>" option, in order to be able to detect partial version numbers. 2012-08-15 Jan Nijtmans <[email protected]> | > > > > > > > > | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 | 2012-08-20 Jan Nijtmans <[email protected]> * win/tclWinPort.h: Remove wrapper macro for ntohs(): unnecessary, because it doesn't require an initialized winsock_2 library. See: <http://msdn.microsoft.com/en-us/library/windows/desktop/ms740075%28v=vs.85%29.aspx> * win/tclWinSock.c * generic/tclStubInit.c 2012-08-17 Jan Nijtmans <[email protected]> * win/nmakehlp.c: Add "-V<num>" option, in order to be able to detect partial version numbers. 2012-08-15 Jan Nijtmans <[email protected]> |
︙ | ︙ |
Changes to generic/tclStubInit.c.
︙ | ︙ | |||
49 50 51 52 53 54 55 56 57 58 59 60 61 62 | #define TclSockMinimumBuffersOld sockMinimumBuffersOld static int TclSockMinimumBuffersOld(int sock, int size) { return TclSockMinimumBuffers(INT2PTR(sock), size); } #endif #ifdef __WIN32__ # define TclUnixWaitForFile 0 # define TclUnixCopyFile 0 # define TclpReaddir 0 # define TclpIsAtty 0 #elif defined(__CYGWIN__) # define TclpIsAtty TclPlatIsAtty | > > | 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 | #define TclSockMinimumBuffersOld sockMinimumBuffersOld static int TclSockMinimumBuffersOld(int sock, int size) { return TclSockMinimumBuffers(INT2PTR(sock), size); } #endif #define TclWinNToHS ntohs #ifdef __WIN32__ # define TclUnixWaitForFile 0 # define TclUnixCopyFile 0 # define TclpReaddir 0 # define TclpIsAtty 0 #elif defined(__CYGWIN__) # define TclpIsAtty TclPlatIsAtty |
︙ | ︙ | |||
85 86 87 88 89 90 91 | { void *hInstance = NULL; GetModuleHandleExW(GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS, (const char *)&winTCharEncoding, &hInstance); return hInstance; } | < < < < < < | 87 88 89 90 91 92 93 94 95 96 97 98 99 100 | { void *hInstance = NULL; GetModuleHandleExW(GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS, (const char *)&winTCharEncoding, &hInstance); return hInstance; } int TclWinSetSockOpt(SOCKET s, int level, int optname, const char *optval, int optlen) { return setsockopt((int) s, level, optname, optval, optlen); } |
︙ | ︙ |
Changes to win/tclWinPort.h.
︙ | ︙ | |||
534 535 536 537 538 539 540 | * The following defines map from standard socket names to our internal * wrappers that redirect through the winSock function table (see the * file tclWinSock.c). */ #define getservbyname TclWinGetServByName #define getsockopt TclWinGetSockOpt | < | 534 535 536 537 538 539 540 541 542 543 544 545 546 547 | * The following defines map from standard socket names to our internal * wrappers that redirect through the winSock function table (see the * file tclWinSock.c). */ #define getservbyname TclWinGetServByName #define getsockopt TclWinGetSockOpt #define setsockopt TclWinSetSockOpt /* This type is not defined in the Windows headers */ #define socklen_t int /* * The following macros have trivial definitions, allowing generic code to |
︙ | ︙ |
Changes to win/tclWinSock.c.
︙ | ︙ | |||
68 69 70 71 72 73 74 | /* * Make sure to remove the redirection defines set in tclWinPort.h that is in * use in other sections of the core, except for us. */ #undef getservbyname #undef getsockopt | < | 68 69 70 71 72 73 74 75 76 77 78 79 80 81 | /* * Make sure to remove the redirection defines set in tclWinPort.h that is in * use in other sections of the core, except for us. */ #undef getservbyname #undef getsockopt #undef setsockopt /* * The following variable is used to tell whether this module has been * initialized. If 1, initialization of sockets was successful, if -1 then * socket initialization failed (WSAStartup failed). */ |
︙ | ︙ | |||
159 160 161 162 163 164 165 | }; /* * The following structure is what is added to the Tcl event queue when a * socket event occurs. */ | | | 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 | }; /* * The following structure is what is added to the Tcl event queue when a * socket event occurs. */ typedef struct { Tcl_Event header; /* Information that is standard for all * events. */ SOCKET socket; /* Socket descriptor that is ready. Used to * find the SocketInfo structure for the file * (can't point directly to the SocketInfo * structure because it could go away while * the event is queued). */ |
︙ | ︙ | |||
187 188 189 190 191 192 193 | #define SOCKET_ASYNC (1<<0) /* The socket is in blocking mode. */ #define SOCKET_EOF (1<<1) /* A zero read happened on the * socket. */ #define SOCKET_ASYNC_CONNECT (1<<2) /* This socket uses async connect. */ #define SOCKET_PENDING (1<<3) /* A message has been sent for this * socket */ | | | 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 | #define SOCKET_ASYNC (1<<0) /* The socket is in blocking mode. */ #define SOCKET_EOF (1<<1) /* A zero read happened on the * socket. */ #define SOCKET_ASYNC_CONNECT (1<<2) /* This socket uses async connect. */ #define SOCKET_PENDING (1<<3) /* A message has been sent for this * socket */ typedef struct { HWND hwnd; /* Handle to window for socket messages. */ HANDLE socketThread; /* Thread handling the window */ Tcl_ThreadId threadId; /* Parent thread. */ HANDLE readyEvent; /* Event indicating that a socket event is * ready. Also used to indicate that the * socketThread has been initialized and has * started. */ |
︙ | ︙ | |||
2732 2733 2734 2735 2736 2737 2738 | if (!SocketsEnabled()) { return SOCKET_ERROR; } return setsockopt(s, level, optname, optval, optlen); } | < < < < < < < < < < < < < < < < < | 2731 2732 2733 2734 2735 2736 2737 2738 2739 2740 2741 2742 2743 2744 | if (!SocketsEnabled()) { return SOCKET_ERROR; } return setsockopt(s, level, optname, optval, optlen); } char * TclpInetNtoa( struct in_addr addr) { /* * Check that WinSock is initialized; do not call it if not, to prevent * system crashes. This can happen at exit time if the exit handler for |
︙ | ︙ |