mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-10-18 20:58:48 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

use the '__linux__' instead 'linux' preprocessor define

Browse source
This commit is contained in:
Benjamin Peterson 2016-09-07 14:08:34 -07:00
parent 56be5f5376
commit b6c345878a
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Modules/socketmodule.c
View file

@ -153,7 +153,7 @@ if_indextoname(index) -- return the corresponding interface name\n\
On the other hand, not all Linux versions agree, so there the settings On the other hand, not all Linux versions agree, so there the settings
computed by the configure script are needed! */ computed by the configure script are needed! */
#ifndef linux #ifndef __linux__
# undef HAVE_GETHOSTBYNAME_R_3_ARG # undef HAVE_GETHOSTBYNAME_R_3_ARG
# undef HAVE_GETHOSTBYNAME_R_5_ARG # undef HAVE_GETHOSTBYNAME_R_5_ARG
# undef HAVE_GETHOSTBYNAME_R_6_ARG # undef HAVE_GETHOSTBYNAME_R_6_ARG
@ -176,7 +176,7 @@ if_indextoname(index) -- return the corresponding interface name\n\
# define HAVE_GETHOSTBYNAME_R_3_ARG # define HAVE_GETHOSTBYNAME_R_3_ARG
# elif defined(__sun) || defined(__sgi) # elif defined(__sun) || defined(__sgi)
# define HAVE_GETHOSTBYNAME_R_5_ARG # define HAVE_GETHOSTBYNAME_R_5_ARG
# elif defined(linux) # elif defined(__linux__)
/* Rely on the configure script */ /* Rely on the configure script */
# else # else
# undef HAVE_GETHOSTBYNAME_R # undef HAVE_GETHOSTBYNAME_R
@ -1214,7 +1214,7 @@ makesockaddr(SOCKET_T sockfd, struct sockaddr *addr, size_t addrlen, int proto)
case AF_UNIX: case AF_UNIX:
{ {
struct sockaddr_un *a = (struct sockaddr_un *) addr; struct sockaddr_un *a = (struct sockaddr_un *) addr;
#ifdef linux #ifdef __linux__
if (a->sun_path[0] == 0) { /* Linux abstract namespace */ if (a->sun_path[0] == 0) { /* Linux abstract namespace */
addrlen -= offsetof(struct sockaddr_un, sun_path); addrlen -= offsetof(struct sockaddr_un, sun_path);
return PyBytes_FromStringAndSize(a->sun_path, addrlen); return PyBytes_FromStringAndSize(a->sun_path, addrlen);
@ -1529,7 +1529,7 @@ getsockaddrarg(PySocketSockObject *s, PyObject *args,
assert(path.len >= 0); assert(path.len >= 0);
addr = (struct sockaddr_un*)addr_ret; addr = (struct sockaddr_un*)addr_ret;
#ifdef linux #ifdef __linux__
if (path.len > 0 && *(const char *)path.buf == 0) { if (path.len > 0 && *(const char *)path.buf == 0) {
/* Linux abstract namespace extension */ /* Linux abstract namespace extension */
if ((size_t)path.len > sizeof addr->sun_path) { if ((size_t)path.len > sizeof addr->sun_path) {