D50157.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D50157.diff
View Options

	diff --git a/sys/compat/linuxkpi/common/include/linux/stddef.h b/sys/compat/linuxkpi/common/include/linux/stddef.h
	--- a/sys/compat/linuxkpi/common/include/linux/stddef.h
	+++ b/sys/compat/linuxkpi/common/include/linux/stddef.h
	@@ -5,11 +5,27 @@

	#include <sys/stddef.h>

	-#define struct_group(NAME, ...) \
	+/*
	+ * FreeBSD has multiple (vendor) drivers containing copies of this
	+ * and including LinuxKPI headers. Put the #defines behind guards.
	+ */
	+
	+#ifndef __struct_group
	+#define __struct_group(_tag, _name, _attrs, _members...) \
	union { \
	- struct { __VA_ARGS__ }; \
	- struct { __VA_ARGS__ } NAME; \
	- }
	+ struct { _members } _attrs; \
	+ struct _tag { _members } _attrs _name; \
	+ } _attrs
	+#endif

	-#endif /* _LINUXKPI_LINUX_STDDEF_H_ */
	+#ifndef struct_group
	+#define struct_group(_name, _members...) \
	+ __struct_group(/* no tag /, _name, / no attrs */, _members)
	+#endif

	+#ifndef struct_group_tagged
	+#define struct_group_tagged(_tag, _name, _members...) \
	+ __struct_group(_tag, _name, /* no attrs */, _members)
	+#endif
	+
	+#endif /* _LINUXKPI_LINUX_STDDEF_H_ */