ObjFW  Diff

Differences From Artifact [3a008110cb]:

• File src/runtime/runtime-private.h — part of check-in [bc531024f5] at 2012-05-10 18:38:16 on branch runtime — Return objects as void* instead of const void*. (user: js, size: 5251) [annotate] [blame] [check-ins using] [more...]

To Artifact [fdc49ba79e]:

• File src/runtime/runtime-private.h — part of check-in [345eb93240] at 2012-07-17 01:09:50 on branch trunk — Rename ERROR() to OBJC_ERROR().

  ERROR seems to be defined on MinGW32 and it's likely that it's also used
  on other systems, thus it's better to prefix it with OBJC_. (user: js, size: 5256) [annotate] [blame] [check-ins using]

188
189
190
191
192
193
194
195
196
197
198
199
200
201

	uint8_t i = idx >> 8;
	uint8_t j = idx;

	return (void*)s->buckets[i]->buckets[j];
#endif
}

#define ERROR(...)							\
	{								\
		fprintf(stderr, "[objc @ " __FILE__ ":%d] ", __LINE__);	\
		fprintf(stderr, __VA_ARGS__);				\
		fputs("\n", stderr);					\
		abort();						\
	}

|

188
189
190
191
192
193
194
195
196
197
198
199
200
201

	uint8_t i = idx >> 8;
	uint8_t j = idx;

	return (void*)s->buckets[i]->buckets[j];
#endif
}

#define OBJC_ERROR(...)							\
	{								\
		fprintf(stderr, "[objc @ " __FILE__ ":%d] ", __LINE__);	\
		fprintf(stderr, __VA_ARGS__);				\
		fputs("\n", stderr);					\
		abort();						\
	}