[Python-checkins] cpython (merge 3.3 -> default): Issue #20065: socketmodule: Fix build error when AF_CAN is defined without the

charles-francois.natali python-checkins at python.org
Sat Feb 8 22:55:36 CET 2014


http://hg.python.org/cpython/rev/39a60d62d2a6
changeset:   89059:39a60d62d2a6
parent:      89056:5f7e626730df
parent:      89058:b1ff233d3ab1
user:        Charles-François Natali <cf.natali at gmail.com>
date:        Sat Feb 08 22:54:48 2014 +0100
summary:
  Issue #20065: socketmodule: Fix build error when AF_CAN is defined without the
proper CAN headers.

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 AF_CAN
+#ifdef HAVE_LINUX_CAN_H
     case AF_CAN:
     {
         struct sockaddr_can *a = (struct sockaddr_can *)addr;
@@ -1589,7 +1589,7 @@
     }
 #endif
 
-#ifdef AF_CAN
+#ifdef HAVE_LINUX_CAN_H
     case AF_CAN:
         switch (s->sock_proto) {
         case CAN_RAW:
@@ -1796,7 +1796,7 @@
     }
 #endif
 
-#ifdef AF_CAN
+#ifdef HAVE_LINUX_CAN_H
     case AF_CAN:
     {
         *len_ret = sizeof (struct sockaddr_can);

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


More information about the Python-checkins mailing list