Re: [PATCH v7 08/10] include: can.h: update comment about introduction of __kernel_sa_family_t

[Oliver Hartkopp <socketcan@hartkopp.net>]

On 21.01.2014 14:20, Uwe Kleine-König wrote:
> Hello Marc,
> 
> On Tue, Jan 21, 2014 at 02:00:02PM +0100, Marc Kleine-Budde wrote:


> I'd make this:
> 
> -// typedef unsigned short __kernel_sa_family_t;
> -// introduced in Linux 3.2 commit 6602a4baf4d1a73cc4685a39ef859e1c5ddf654c
> +/*
> + * This typedef was introduced in Linux v3.1-rc2
> + * (commit 6602a4baf4d1a73cc4685a39ef859e1c5ddf654c) in <linux/socket.h>.
> + * It must be duplicated here to make the can headers self-contained.
> + */
> + typedef unsigned short __kernel_sa_family_t;
> 
> and then drop the following hunk. That should work as intended also on
> systems that have kernel headers newer than v3.1-rc2 because a
> duplicated typedef shouldn't hurt. (Note I didn't test that or tried to
> find a proof in my C book.)
> 

Good idea!

I double checked this by simply adding two identical typedefs:

--- a/include/socketcan/can.h
+++ b/include/socketcan/can.h
@@ -126,6 +126,10 @@ struct canfd_frame {
 // typedef unsigned short __kernel_sa_family_t;
 // introduced in Linux 3.2 commit 6602a4baf4d1a73cc4685a39ef859e1c5ddf654c

+
+typedef unsigned short __kernel_sa_family_t;
+typedef unsigned short __kernel_sa_family_t;
+
 /**
  * struct sockaddr_can - the sockaddr structure for CAN sockets
  * @can_family:  address family number AF_CAN.

It compiles without problems (and warnings).

Tnx!

Oliver