eessppeelllloo/cryptsetup
1
0
Fork 0
mirror of https://gitlab.com/cryptsetup/cryptsetup.git synced 2025-12-05 16:00:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

Use #if for HAVE*_H defines.

Browse Source
This commit is contained in:
Milan Broz
2025-01-16 12:47:25 +01:00
parent 37d52876b9
commit e5405f2fd8
10 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/crypto_backend/crypto_backend.h
View File

@@ -14,7 +14,7 @@
#include <stdbool.h> #include <stdbool.h>
#include <stddef.h> #include <stddef.h>
#include <string.h> #include <string.h>
#ifdef HAVE_UCHAR_H #if HAVE_UCHAR_H
#include <uchar.h> #include <uchar.h>
#else #else
#define char32_t uint32_t #define char32_t uint32_t

2
lib/libdevmapper.c
View File

@@ -15,7 +15,7 @@
#include <libdevmapper.h> #include <libdevmapper.h>
#include <uuid/uuid.h> #include <uuid/uuid.h>
#include <sys/stat.h> #include <sys/stat.h>
#ifdef HAVE_SYS_SYSMACROS_H #if HAVE_SYS_SYSMACROS_H
# include <sys/sysmacros.h> /* for major, minor */ # include <sys/sysmacros.h> /* for major, minor */
#endif #endif
#include "internal.h" #include "internal.h"

2
lib/luks2/hw_opal/hw_opal.c
View File

@@ -17,7 +17,7 @@
#include <sys/ioctl.h> #include <sys/ioctl.h>
#include <sys/types.h> #include <sys/types.h>
#include <sys/stat.h> #include <sys/stat.h>
#ifdef HAVE_SYS_SYSMACROS_H #if HAVE_SYS_SYSMACROS_H
# include <sys/sysmacros.h> /* for major, minor */ # include <sys/sysmacros.h> /* for major, minor */
#endif #endif

2
lib/nls.h
View File

@@ -5,7 +5,7 @@
#define LOCALEDIR "/usr/share/locale" #define LOCALEDIR "/usr/share/locale"
#endif #endif
#ifdef HAVE_LOCALE_H #if HAVE_LOCALE_H
# include <locale.h> # include <locale.h>
#else #else
# undef setlocale # undef setlocale

6
lib/utils_device.c
View File

@@ -16,10 +16,10 @@
#include <sys/ioctl.h> #include <sys/ioctl.h>
#include <linux/fs.h> #include <linux/fs.h>
#include <unistd.h> #include <unistd.h>
#ifdef HAVE_SYS_SYSMACROS_H #if HAVE_SYS_SYSMACROS_H
# include <sys/sysmacros.h> /* for major, minor */ # include <sys/sysmacros.h> /* for major, minor */
#endif #endif
#ifdef HAVE_SYS_STATVFS_H #if HAVE_SYS_STATVFS_H
# include <sys/statvfs.h> # include <sys/statvfs.h>
#endif #endif
#include "internal.h" #include "internal.h"
@@ -50,7 +50,7 @@ static size_t device_fs_block_size_fd(int fd)
{ {
size_t page_size = crypt_getpagesize(); size_t page_size = crypt_getpagesize();
#ifdef HAVE_SYS_STATVFS_H #if HAVE_SYS_STATVFS_H
struct statvfs buf; struct statvfs buf;
/* /*

2
lib/utils_device_locking.c
View File

@@ -15,7 +15,7 @@
#include <sys/stat.h> #include <sys/stat.h>
#include <sys/types.h> #include <sys/types.h>
#include <unistd.h> #include <unistd.h>
#ifdef HAVE_SYS_SYSMACROS_H #if HAVE_SYS_SYSMACROS_H
# include <sys/sysmacros.h> /* for major, minor */ # include <sys/sysmacros.h> /* for major, minor */
#endif #endif
#include <libgen.h> #include <libgen.h>

2
lib/utils_devpath.c
View File

@@ -17,7 +17,7 @@
#include <limits.h> #include <limits.h>
#include <sys/stat.h> #include <sys/stat.h>
#include <sys/types.h> #include <sys/types.h>
#ifdef HAVE_SYS_SYSMACROS_H #if HAVE_SYS_SYSMACROS_H
# include <sys/sysmacros.h> /* for major, minor */ # include <sys/sysmacros.h> /* for major, minor */
#endif #endif
#include "internal.h" #include "internal.h"

2
lib/utils_loop.c
View File

@@ -15,7 +15,7 @@
#include <limits.h> #include <limits.h>
#include <sys/ioctl.h> #include <sys/ioctl.h>
#include <sys/stat.h> #include <sys/stat.h>
#ifdef HAVE_SYS_SYSMACROS_H #if HAVE_SYS_SYSMACROS_H
# include <sys/sysmacros.h> /* for major, minor */ # include <sys/sysmacros.h> /* for major, minor */
#endif #endif
#include <linux/types.h> #include <linux/types.h>

2
src/utils_blockdev.c
View File

@@ -8,7 +8,7 @@
#include "cryptsetup.h" #include "cryptsetup.h"
#include <dirent.h> #include <dirent.h>
#ifdef HAVE_SYS_SYSMACROS_H #if HAVE_SYS_SYSMACROS_H
# include <sys/sysmacros.h> /* for major, minor */ # include <sys/sysmacros.h> /* for major, minor */
#endif #endif
#include <uuid/uuid.h> #include <uuid/uuid.h>

2
tests/test_utils.c
View File

@@ -21,7 +21,7 @@
# include <linux/keyctl.h> # include <linux/keyctl.h>
# include <sys/syscall.h> # include <sys/syscall.h>
#endif #endif
#ifdef HAVE_SYS_SYSMACROS_H #if HAVE_SYS_SYSMACROS_H
# include <sys/sysmacros.h> # include <sys/sysmacros.h>
#endif #endif
#include <linux/loop.h> #include <linux/loop.h>