ObjFW  Check-in [2965720dbc]

Overview
Comment:Fix compilation on Win32.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA3-256: 2965720dbc6bd42b75ff58c66bef192225a89ba2ae98a1ccc2f997daa9ca7d3b
User & Date: js on 2013-01-07 13:36:21
Other Links: manifest | tags
Context
2013-01-07
14:49
OFProcess: Implement environment passing on Win32. check-in: f51bceaa35 user: js tags: trunk
13:36
Fix compilation on Win32. check-in: 2965720dbc user: js tags: trunk
13:35
Improve API for UTF-16 strings. check-in: 02ca89285f user: js tags: trunk
Changes

Modified src/OFSystemInfo.m from [aa3fde574a] to [5448c83bed].

23
24
25
26
27
28
29




30
31
32
33
34
35
36
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40







+
+
+
+







#include <stdlib.h>

#include <unistd.h>

#ifdef __QNX__
# include <sys/syspage.h>
#endif

#ifdef _WIN32
# include <windows.h>
#endif

static size_t pageSize;
static size_t numberOfCPUs;

@implementation OFSystemInfo
+ (void)initialize
{

Modified src/OFTCPSocket.m from [22a93cdc38] to [fdb5be2048].

499
500
501
502
503
504
505
506


507
508
509
510
511
512
513
499
500
501
502
503
504
505

506
507
508
509
510
511
512
513
514







-
+
+








	if ((sock = socket(res->ai_family, SOCK_STREAM, 0)) == INVALID_SOCKET)
		@throw [OFBindFailedException exceptionWithClass: [self class]
							  socket: self
							    host: host
							    port: port];

	if (setsockopt(sock, SOL_SOCKET, SO_REUSEADDR, &one, sizeof(one)))
	if (setsockopt(sock, SOL_SOCKET, SO_REUSEADDR, (const char*)&one,
	    sizeof(one)))
		@throw [OFSetOptionFailedException
		    exceptionWithClass: [self class]
				stream: self];

	if (bind(sock, res->ai_addr, res->ai_addrlen) == -1) {
		freeaddrinfo(res);
		close(sock);
558
559
560
561
562
563
564
565


566
567
568
569
570
571
572
559
560
561
562
563
564
565

566
567
568
569
570
571
572
573
574







-
+
+







# endif
	if ((sock = socket(AF_INET, SOCK_STREAM, 0)) == INVALID_SOCKET)
		@throw [OFBindFailedException exceptionWithClass: [self class]
							  socket: self
							    host: host
							    port: port];

	if (setsockopt(sock, SOL_SOCKET, SO_REUSEADDR, &one, sizeof(one)))
	if (setsockopt(sock, SOL_SOCKET, SO_REUSEADDR, (const char*)&one,
	    sizeof(one)))
		@throw [OFSetOptionFailedException
		    exceptionWithClass: [self class]
				stream: self];

	if (bind(sock, (struct sockaddr*)&addr.in, sizeof(addr.in)) == -1) {
		close(sock);
		sock = INVALID_SOCKET;