Mercurial > cpython-lru_cache-weakref

comparison Modules/socketmodule.c @ 65244:20f463a4584d 2.7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merged revisions 85404 via svnmerge from svn+ssh://pythondev@svn.python.org/python/branches/py3k ........ r85404 | gregory.p.smith | 2010-10-12 20:39:47 -0700 (Tue, 12 Oct 2010) | 2 lines fix compliation on NetBSD ........
author Gregory P. Smith <greg@mad-scientist.com>
date Wed, 13 Oct 2010 03:42:10 +0000
parents 1dc2b50d344f
children 7025278c5a41
comparison
equal deleted inserted replaced
65238:c0908cebf184 65244:20f463a4584d
377 377
378 #ifndef SOCKETCLOSE 378 #ifndef SOCKETCLOSE
379 #define SOCKETCLOSE close 379 #define SOCKETCLOSE close
380 #endif 380 #endif
381 381
382 #if defined(HAVE_BLUETOOTH_H) || defined(HAVE_BLUETOOTH_BLUETOOTH_H) && !defined(__NetBSD__) 382 #if (defined(HAVE_BLUETOOTH_H) || defined(HAVE_BLUETOOTH_BLUETOOTH_H)) && !defined(__NetBSD__)
383 #define USE_BLUETOOTH 1 383 #define USE_BLUETOOTH 1
384 #if defined(__FreeBSD__) 384 #if defined(__FreeBSD__)
385 #define BTPROTO_L2CAP BLUETOOTH_PROTO_L2CAP 385 #define BTPROTO_L2CAP BLUETOOTH_PROTO_L2CAP
386 #define BTPROTO_RFCOMM BLUETOOTH_PROTO_RFCOMM 386 #define BTPROTO_RFCOMM BLUETOOTH_PROTO_RFCOMM
387 #define BTPROTO_HCI BLUETOOTH_PROTO_HCI 387 #define BTPROTO_HCI BLUETOOTH_PROTO_HCI