summaryrefslogtreecommitdiff
path: root/src/vtestream-file.h
diff options
context:
space:
mode:
authorChristian Persch <chpe@src.gnome.org>2023-03-08 20:36:48 +0100
committerChristian Persch <chpe@src.gnome.org>2023-03-08 20:36:48 +0100
commitfb3220bee959d37f58daf702165f142ef9fab9f4 (patch)
tree7646df3d003c5bc730e78d74b8deae746795831f /src/vtestream-file.h
parent75543c3b30dbf696b084e927dabbf52a41d32638 (diff)
downloadvte-fb3220bee959d37f58daf702165f142ef9fab9f4.tar.gz
all: Use defined values for defines
... instead of defined/undefined names, so that -Wundef can catch mistakes.
Diffstat (limited to 'src/vtestream-file.h')
-rw-r--r--src/vtestream-file.h16
1 files changed, 9 insertions, 7 deletions
diff --git a/src/vtestream-file.h b/src/vtestream-file.h
index 1ab68fd5..d9b433be 100644
--- a/src/vtestream-file.h
+++ b/src/vtestream-file.h
@@ -83,16 +83,18 @@
#include <unistd.h>
#include <zlib.h>
-#ifdef WITH_GNUTLS
+#include "vteutils.h"
+
+#if WITH_GNUTLS
# include <gnutls/gnutls.h>
# include <gnutls/crypto.h>
+#else
+#undef WITH_GNUTLS
#endif
-#include "vteutils.h"
-
G_BEGIN_DECLS
-#ifdef WITH_GNUTLS
+#if WITH_GNUTLS
/* Currently the code requires that a stream cipher (e.g. GCM) is used
* which can encrypt any amount of data without need for padding. */
# define VTE_CIPHER_ALGORITHM GNUTLS_CIPHER_AES_256_GCM
@@ -126,11 +128,11 @@ typedef guint8 _vte_overwrite_counter_t;
/******************************************************************************************/
-#ifndef HAVE_EXPLICIT_BZERO
+#if !HAVE_EXPLICIT_BZERO
#define explicit_bzero(s, n) memset((s), 0, (n))
#endif
-#ifndef HAVE_PREAD
+#if !HAVE_PREAD
#define pread _pread
static inline gsize
pread (int fd, char *data, gsize len, gsize offset)
@@ -141,7 +143,7 @@ pread (int fd, char *data, gsize len, gsize offset)
}
#endif
-#ifndef HAVE_PWRITE
+#if !HAVE_PWRITE
#define pwrite _pwrite
static inline gsize
pwrite (int fd, char *data, gsize len, gsize offset)