diff options
author | ng0 <ng0@n0.is> | 2019-11-20 13:28:01 +0000 |
---|---|---|
committer | ng0 <ng0@n0.is> | 2019-11-20 13:28:01 +0000 |
commit | 13226e828c6b7d56c77444afe159c1ccf008d62d (patch) | |
tree | 012f078ef372530f02e2ff04e7b8e2cd0149c9e4 /src/arm/gnunet-service-arm.c | |
parent | 522a4b35a04b2bc8f50b25db8b9a30ef4ab9d9e2 (diff) | |
download | gnunet-13226e828c6b7d56c77444afe159c1ccf008d62d.tar.gz gnunet-13226e828c6b7d56c77444afe159c1ccf008d62d.zip |
follow-up to 7c14b80a011e9e99b1cef0bfd96bae364edd5663:
use __linux__ instead of redefined LINUX.
Diffstat (limited to 'src/arm/gnunet-service-arm.c')
-rw-r--r-- | src/arm/gnunet-service-arm.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/arm/gnunet-service-arm.c b/src/arm/gnunet-service-arm.c index 01bc48960..09d85ca89 100644 --- a/src/arm/gnunet-service-arm.c +++ b/src/arm/gnunet-service-arm.c | |||
@@ -301,7 +301,7 @@ add_unixpath (struct sockaddr **saddrs, | |||
301 | un = GNUNET_new (struct sockaddr_un); | 301 | un = GNUNET_new (struct sockaddr_un); |
302 | un->sun_family = AF_UNIX; | 302 | un->sun_family = AF_UNIX; |
303 | GNUNET_strlcpy (un->sun_path, unixpath, sizeof(un->sun_path)); | 303 | GNUNET_strlcpy (un->sun_path, unixpath, sizeof(un->sun_path)); |
304 | #ifdef LINUX | 304 | #ifdef __linux__ |
305 | if (GNUNET_YES == abstract) | 305 | if (GNUNET_YES == abstract) |
306 | un->sun_path[0] = '\0'; | 306 | un->sun_path[0] = '\0'; |
307 | #endif | 307 | #endif |
@@ -455,7 +455,7 @@ get_server_addresses (const char *service_name, | |||
455 | unixpath = GNUNET_NETWORK_shorten_unixpath (unixpath); | 455 | unixpath = GNUNET_NETWORK_shorten_unixpath (unixpath); |
456 | LOG (GNUNET_ERROR_TYPE_INFO, _ ("Using `%s' instead\n"), unixpath); | 456 | LOG (GNUNET_ERROR_TYPE_INFO, _ ("Using `%s' instead\n"), unixpath); |
457 | } | 457 | } |
458 | #ifdef LINUX | 458 | #ifdef __linux__ |
459 | abstract = GNUNET_CONFIGURATION_get_value_yesno (cfg, | 459 | abstract = GNUNET_CONFIGURATION_get_value_yesno (cfg, |
460 | "TESTING", | 460 | "TESTING", |
461 | "USE_ABSTRACT_SOCKETS"); | 461 | "USE_ABSTRACT_SOCKETS"); |
@@ -1081,7 +1081,7 @@ create_listen_socket (struct sockaddr *sa, | |||
1081 | return; | 1081 | return; |
1082 | } | 1082 | } |
1083 | if ((AF_UNIX == sa->sa_family) | 1083 | if ((AF_UNIX == sa->sa_family) |
1084 | #ifdef LINUX | 1084 | #ifdef __linux__ |
1085 | /* Permission settings are not required when abstract sockets are used */ | 1085 | /* Permission settings are not required when abstract sockets are used */ |
1086 | && ('\0' != ((const struct sockaddr_un *) sa)->sun_path[0]) | 1086 | && ('\0' != ((const struct sockaddr_un *) sa)->sun_path[0]) |
1087 | #endif | 1087 | #endif |
@@ -2188,7 +2188,7 @@ main (int argc, char *const *argv) | |||
2188 | } | 2188 | } |
2189 | 2189 | ||
2190 | 2190 | ||
2191 | #if defined(LINUX) && defined(__GLIBC__) | 2191 | #if defined(__linux__) && defined(__GLIBC__) |
2192 | #include <malloc.h> | 2192 | #include <malloc.h> |
2193 | 2193 | ||
2194 | /** | 2194 | /** |