summaryrefslogtreecommitdiff
path: root/src/util
diff options
context:
space:
mode:
Diffstat (limited to 'src/util')
-rw-r--r--src/util/disk.c2
-rw-r--r--src/util/gnunet-service-resolver.c2
-rw-r--r--src/util/network.c2
-rw-r--r--src/util/os_installation.c6
-rw-r--r--src/util/test_bio.c4
5 files changed, 8 insertions, 8 deletions
diff --git a/src/util/disk.c b/src/util/disk.c
index 866dbc301..2d5e353c8 100644
--- a/src/util/disk.c
+++ b/src/util/disk.c
@@ -1505,7 +1505,7 @@ GNUNET_DISK_file_sync (const struct GNUNET_DISK_FileHandle *h)
return GNUNET_SYSERR;
}
-#if ! defined(LINUX) || ! defined(GNU)
+#if ! defined(__linux__) || ! defined(GNU)
return fsync (h->fd) == -1 ? GNUNET_SYSERR : GNUNET_OK;
#else
return fdatasync (h->fd) == -1 ? GNUNET_SYSERR : GNUNET_OK;
diff --git a/src/util/gnunet-service-resolver.c b/src/util/gnunet-service-resolver.c
index c82a18ab8..357453da7 100644
--- a/src/util/gnunet-service-resolver.c
+++ b/src/util/gnunet-service-resolver.c
@@ -1362,7 +1362,7 @@ GNUNET_SERVICE_MAIN (
GNUNET_MQ_handler_end ());
-#if defined(LINUX) && defined(__GLIBC__)
+#if defined(__linux__) && defined(__GLIBC__)
#include <malloc.h>
/**
diff --git a/src/util/network.c b/src/util/network.c
index 2b407d97c..52ae3d2c7 100644
--- a/src/util/network.c
+++ b/src/util/network.c
@@ -962,7 +962,7 @@ GNUNET_NETWORK_socket_disable_corking (struct GNUNET_NETWORK_Handle *desc)
{
int ret = 0;
-#if LINUX
+#if __linux__
int value = 0;
if (0 !=
diff --git a/src/util/os_installation.c b/src/util/os_installation.c
index 7aa4d1254..846ceeeec 100644
--- a/src/util/os_installation.c
+++ b/src/util/os_installation.c
@@ -134,7 +134,7 @@ GNUNET_OS_init (const struct GNUNET_OS_ProjectData *pd)
}
-#if LINUX
+#if __linux__
/**
* Try to determine path by reading /proc/PID/exe
*
@@ -383,7 +383,7 @@ os_get_gnunet_path ()
if (NULL != (ret = get_path_from_GNUNET_PREFIX ()))
return ret;
-#if LINUX
+#if __linux__
if (NULL != (ret = get_path_from_proc_maps ()))
return ret;
/* try path *first*, before /proc/exe, as /proc/exe can be wrong */
@@ -421,7 +421,7 @@ os_get_exec_path ()
{
char *ret = NULL;
-#if LINUX
+#if __linux__
if (NULL != (ret = get_path_from_proc_exe ()))
return ret;
#endif
diff --git a/src/util/test_bio.c b/src/util/test_bio.c
index 8ff93c168..13ae1cf56 100644
--- a/src/util/test_bio.c
+++ b/src/util/test_bio.c
@@ -200,7 +200,7 @@ test_bigmeta_rw ()
static int
test_directory_r ()
{
-#if LINUX
+#if __linux__
char *msg;
char readResult[200];
struct GNUNET_BIO_ReadHandle *fileR;
@@ -244,7 +244,7 @@ test_nullfile_rw ()
static int
test_fullfile_rw ()
{
-#ifdef LINUX
+#ifdef __linux__
/* /dev/full only seems to exist on Linux */
char *msg;
int64_t testNum;