ObjFW  Check-in [48c67b1444]

Overview
Comment:Fix missing include in exceptions/common.h.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA3-256: 48c67b1444a9d9398f718f99c8aa2c48469fa21bbdd338c2e3d5861df4be8b79
User & Date: js on 2011-03-29 23:32:23
Other Links: manifest | tags
Context
2011-03-30
00:03
A few win32 fixes. check-in: 13a4dee1da user: js tags: trunk
2011-03-29
23:32
Fix missing include in exceptions/common.h. check-in: 48c67b1444 user: js tags: trunk
23:27
Work around compiler bugs. check-in: 6022cfa458 user: js tags: trunk
Changes

Modified src/OFTCPSocket.m from [2a0787d82a] to [f6b617258d].

128
129
130
131
132
133
134

135
136
137
138
139
140
141

	if ((he = gethostbyname([host cString])) == NULL) {
# ifdef OF_THREADS
		[addrlist release];
		[mutex unlock];
# endif
		@throw [OFAddressTranslationFailedException newWithClass: isa

								    host: host];
	}

	memset(&addr, 0, sizeof(addr));
	addr.sin_family = AF_INET;
	addr.sin_port = of_bswap16_if_le(port);








>







128
129
130
131
132
133
134
135
136
137
138
139
140
141
142

	if ((he = gethostbyname([host cString])) == NULL) {
# ifdef OF_THREADS
		[addrlist release];
		[mutex unlock];
# endif
		@throw [OFAddressTranslationFailedException newWithClass: isa
								  socket: self
								    host: host];
	}

	memset(&addr, 0, sizeof(addr));
	addr.sin_family = AF_INET;
	addr.sin_port = of_bswap16_if_le(port);

265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
		[mutex unlock];
# endif
		@throw [OFAddressTranslationFailedException newWithClass: isa
								  socket: self
								    host: host];
	}

	memcpy(addr.in.sin_addr.s_addr, he->h_addr_list[0], he->h_length);

# ifdef OF_THREADS
	[mutex unlock];
# endif
	if ((sock = socket(AF_INET, SOCK_STREAM, 0)) == INVALID_SOCKET)
		@throw [OFBindFailedException newWithClass: isa
						    socket: self







|







266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
		[mutex unlock];
# endif
		@throw [OFAddressTranslationFailedException newWithClass: isa
								  socket: self
								    host: host];
	}

	memcpy(&addr.in.sin_addr.s_addr, he->h_addr_list[0], he->h_length);

# ifdef OF_THREADS
	[mutex unlock];
# endif
	if ((sock = socket(AF_INET, SOCK_STREAM, 0)) == INVALID_SOCKET)
		@throw [OFBindFailedException newWithClass: isa
						    socket: self

Modified src/exceptions/common.h from [4c4f654284] to [1a81af8861].

22
23
24
25
26
27
28



29
30
31
32
33
34
35

#ifdef OF_OLD_GNU_RUNTIME
# import <objc/objc-api.h>
# define sel_getName(x) sel_get_name(x)
#endif

#ifndef _WIN32



# include <errno.h>
# define GET_ERRNO	errno
# ifndef HAVE_THREADSAFE_GETADDRINFO
#  define GET_AT_ERRNO	h_errno
# else
#  define GET_AT_ERRNO	errno
# endif







>
>
>







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

#ifdef OF_OLD_GNU_RUNTIME
# import <objc/objc-api.h>
# define sel_getName(x) sel_get_name(x)
#endif

#ifndef _WIN32
#if !defined(HAVE_THREADSAFE_GETADDRINFO) && !defined(_PSP)
# include <netdb.h>
#endif
# include <errno.h>
# define GET_ERRNO	errno
# ifndef HAVE_THREADSAFE_GETADDRINFO
#  define GET_AT_ERRNO	h_errno
# else
#  define GET_AT_ERRNO	errno
# endif