ObjFW  Diff

Differences From Artifact [e55d2ae955]:

• File src/OFKernelEventObserver_select.m — part of check-in [cc4cb0d824] at 2017-05-02 21:10:33 on branch trunk — exceptions: Add nullability specifiers (user: js, size: 5109) [annotate] [blame] [check-ins using]

To Artifact [ca3998cc6e]:

• File src/OFKernelEventObserver_select.m — part of check-in [c658e97994] at 2017-05-21 20:03:06 on branch trunk — Cast several socket-related arguments to void *

  This is required to make it work on MorphOS with -noixemul, as socket
  functions take UBYTE * arguments instead then, resulting in a warning
  about signedness because char is signed. (user: js, size: 5117) [annotate] [blame] [check-ins using]

179
180
181
182
183
184
185
186
187
188
189
190
191
192
193

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

#ifdef OF_HAVE_PIPE
		OF_ENSURE(read(_cancelFD[0], &buffer, 1) == 1);
#else
		OF_ENSURE(recvfrom(_cancelFD[0], &buffer, 1, 0, NULL,
		    NULL) == 1);
#endif
	}

	objects = [_readObjects objects];
	count = [_readObjects count];

|

179
180
181
182
183
184
185
186
187
188
189
190
191
192
193

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

#ifdef OF_HAVE_PIPE
		OF_ENSURE(read(_cancelFD[0], &buffer, 1) == 1);
#else
		OF_ENSURE(recvfrom(_cancelFD[0], (void *)&buffer, 1, 0, NULL,
		    NULL) == 1);
#endif
	}

	objects = [_readObjects objects];
	count = [_readObjects count];