[Python-checkins] cpython (merge 3.4 -> default): Issue #10141, Issue 20065: Merged from 3.4.

[vinay.sajip]

http://hg.python.org/cpython/rev/20cced06acdd
changeset:   89897:20cced06acdd
parent:      89895:7cca663a72eb
parent:      89896:9dc199b921eb
user:        Vinay Sajip <vinay_sajip at yahoo.co.uk>
date:        Fri Mar 21 11:45:27 2014 +0000
summary:
  Issue #10141, Issue 20065: Merged from 3.4.

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


diff --git a/Modules/socketmodule.c b/Modules/socketmodule.c
--- a/Modules/socketmodule.c
+++ b/Modules/socketmodule.c
@@ -1589,7 +1589,7 @@
     }
 #endif
 
-#ifdef AF_CAN
+#if defined(AF_CAN) && defined(CAN_RAW) && defined(CAN_BCM)
     case AF_CAN:
         switch (s->sock_proto) {
         case CAN_RAW:

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