(original) (raw)

changeset: 89873:df427bf067d7 branch: 3.4 parent: 89871:bdad874195d6 user: Vinay Sajip <vinay_sajip@yahoo.co.uk> date: Thu Mar 20 12:42:42 2014 +0000 files: Modules/socketmodule.c description: Issue #10141: updated new usages of AF_CAN to be in #ifdef AF_CAN rather than #ifdef HAVE_LINUX_CAN_H to allow compilation on older Linuxes. diff -r bdad874195d6 -r df427bf067d7 Modules/socketmodule.c --- a/Modules/socketmodule.c Thu Mar 20 09:26:55 2014 +0100 +++ b/Modules/socketmodule.c Thu Mar 20 12:42:42 2014 +0000 @@ -1165,7 +1165,7 @@ } #endif -#ifdef HAVE_LINUX_CAN_H +#ifdef AF_CAN case AF_CAN: { struct sockaddr_can *a = (struct sockaddr_can *)addr; @@ -1589,7 +1589,7 @@ } #endif -#ifdef HAVE_LINUX_CAN_H +#ifdef AF_CAN case AF_CAN: switch (s->sock_proto) { case CAN_RAW: @@ -1796,7 +1796,7 @@ } #endif -#ifdef HAVE_LINUX_CAN_H +#ifdef AF_CAN case AF_CAN: { *len_ret = sizeof (struct sockaddr_can); </vinay_sajip@yahoo.co.uk>