ObjFW  Diff

Differences From Artifact [caa1fbb7ea]:

• File src/OFKernelEventObserver_select.m — part of check-in [f9d12201f8] at 2014-02-18 00:22:43 on branch trunk — Move around a few defines to be more consistent (user: js, size: 3472) [annotate] [blame] [check-ins using]

To Artifact [434ba010aa]:

• File src/OFKernelEventObserver_select.m — part of check-in [4e59d2692f] at 2014-04-26 00:40:17 on branch trunk — Fix a few issues on LLP64 and Win64

  LLP64 was mostly fast enumeration using an unsigned long for the state,
  which can't store a pointer or a size_t on LLP64. This is now solved by
  either throwing an OFOutOfRangeException if the value of the size_t is
  bigger than ULONG_MAX or storing the pointer in the extra field (copied
  using memcpy, as it's an array of unsigned long, which again would be
  too small to store a pointer).

  Win64 was mostly Microsoft not being able to decide whether a length is
  a size_t, a DWORD, an int or an unsigned int (thus the different types
  in places that seem to be almost the same). But since that would not be
  confusing enough, a file descriptor is an int if it's for a file, but a
  long long if it is for a socket. But of course, for ReadFile and friends
  it's a DWORD instead of an int then. (user: js, size: 3538) [annotate] [blame] [check-ins using]

93
94
95
96
97
98
99

100



101
102
103
104
105
106
107

	/*
	 * We cast to int before assigning to tv_usec in order to avoid a
	 * warning with Apple GCC on PPC. POSIX defines this as suseconds_t,
	 * however, this is not available on Win32. As an int should always
	 * satisfy the required range, we just cast to int.
	 */

	timeout.tv_sec = (time_t)timeInterval;



	timeout.tv_usec = (int)lrint((timeInterval - timeout.tv_sec) * 1000);

	if (select((int)_maxFD + 1, &readFDs, &writeFDs, NULL,
	    (timeInterval != -1 ? &timeout : NULL)) < 1)
		return false;

	if (FD_ISSET(_cancelFD[0], &readFDs)) {

>

>
>
>

93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111

	/*
	 * We cast to int before assigning to tv_usec in order to avoid a
	 * warning with Apple GCC on PPC. POSIX defines this as suseconds_t,
	 * however, this is not available on Win32. As an int should always
	 * satisfy the required range, we just cast to int.
	 */
#ifndef _WIN32
	timeout.tv_sec = (time_t)timeInterval;
#else
	timeout.tv_sec = (long)timeInterval;
#endif
	timeout.tv_usec = (int)lrint((timeInterval - timeout.tv_sec) * 1000);

	if (select((int)_maxFD + 1, &readFDs, &writeFDs, NULL,
	    (timeInterval != -1 ? &timeout : NULL)) < 1)
		return false;

	if (FD_ISSET(_cancelFD[0], &readFDs)) {