[Python-checkins] cpython (merge 3.4 -> default): Merged from 3.4.

[vinay.sajip]

http://hg.python.org/cpython/rev/76255e78c309
changeset:   89874:76255e78c309
parent:      89872:2e4692a762d5
parent:      89873:df427bf067d7
user:        Vinay Sajip <vinay_sajip at yahoo.co.uk>
date:        Thu Mar 20 12:43:50 2014 +0000
summary:
  Merged from 3.4.

files:
  Modules/socketmodule.c |  6 +++---
  1 files changed, 3 insertions(+), 3 deletions(-)


diff --git a/Modules/socketmodule.c b/Modules/socketmodule.c
--- a/Modules/socketmodule.c
+++ b/Modules/socketmodule.c
@@ -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);

-- 
Repository URL: http://hg.python.org/cpython