Fossil

Check-in [0658068a]
Login

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:include <winsock2.h> before <ws2tcpip.h> whenever needed. Thanks to Konstantin Khomoutov for reporting this.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1: 0658068a237b8a5c3bc9df61e1b40f15da53b8ef
User & Date: jan.nijtmans 2012-12-14 11:50:24
Context
2012-12-14
18:58
Rename the test-udiff command to test-diff and give it the capability to use the --tk option. check-in: 4cf8c16c user: drh tags: trunk
11:50
include <winsock2.h> before <ws2tcpip.h> whenever needed. Thanks to Konstantin Khomoutov for reporting this. check-in: 0658068a user: jan.nijtmans tags: trunk
2012-12-13
12:31
When determining the interactive user, check the FOSSIL_USER environment variable. Also, add a property to the Windows resource file indicating if markdown support was compiled into the binary. check-in: 743b64ec user: mistachkin tags: trunk
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Changes to src/cgi.c.

19
20
21
22
23
24
25

26
27
28
29
30
31
32
** services to CGI programs.  There are procedures for parsing and
** dispensing QUERY_STRING parameters and cookies, the "mprintf()"
** formatting function and its cousins, and routines to encode and
** decode strings in HTML or HTTP.
*/
#include "config.h"
#ifdef _WIN32

# include <ws2tcpip.h>
#else
# include <sys/socket.h>
# include <netinet/in.h>
# include <arpa/inet.h>
# include <sys/times.h>
# include <sys/time.h>







>







19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
** services to CGI programs.  There are procedures for parsing and
** dispensing QUERY_STRING parameters and cookies, the "mprintf()"
** formatting function and its cousins, and routines to encode and
** decode strings in HTML or HTTP.
*/
#include "config.h"
#ifdef _WIN32
# include <winsock2.h>
# include <ws2tcpip.h>
#else
# include <sys/socket.h>
# include <netinet/in.h>
# include <arpa/inet.h>
# include <sys/times.h>
# include <sys/time.h>

Changes to src/http_socket.c.

25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
** Low-level sockets are abstracted out into this module because they 
** are handled different on Unix and windows.
*/

#include "config.h"
#include "http_socket.h"
#if defined(_WIN32)
#  if defined(__MINGW32__)
#    include <ws2tcpip.h>          
#  endif
#  include <windows.h>
#else
#  include <netinet/in.h>
#  include <arpa/inet.h>
#  include <sys/socket.h>
#  include <netdb.h>
#endif
#include <assert.h>







<
|
<
|







25
26
27
28
29
30
31

32

33
34
35
36
37
38
39
40
** Low-level sockets are abstracted out into this module because they 
** are handled different on Unix and windows.
*/

#include "config.h"
#include "http_socket.h"
#if defined(_WIN32)

#  include <winsock2.h>

#  include <ws2tcpip.h>
#else
#  include <netinet/in.h>
#  include <arpa/inet.h>
#  include <sys/socket.h>
#  include <netdb.h>
#endif
#include <assert.h>