Rename def.h to constants.h

The name "def.h" originates from before the rule of "no needless abbreviations"
was established. Let's rename the file to clarify that it contains a collection
of various semi-related constants.

diff --git a/src/analyze/analyze-cat-config.c b/src/analyze/analyze-cat-config.c
index d214ceaf4247c55915b2449682c32216996cdda2..a30662b49f70c7b83ed79ac8265849f53e6569ed 100644 (file)
--- a/src/analyze/analyze-cat-config.c
+++ b/src/analyze/analyze-cat-config.c
@@ -3,7 +3,7 @@
 #include "analyze.h"
 #include "analyze-cat-config.h"
 #include "conf-files.h"
-#include "def.h"
+#include "constants.h"
 #include "nulstr-util.h"
 #include "path-util.h"
 #include "pretty-print.h"

diff --git a/src/analyze/analyze.c b/src/analyze/analyze.c
index 74556ac0f72c39a049ec046b780791f59616f505..cac2d3adba70847bae44e08f1d41a273862da17b 100644 (file)
--- a/src/analyze/analyze.c
+++ b/src/analyze/analyze.c
@@ -47,7 +47,7 @@
 #include "capability-util.h"
 #include "conf-files.h"
 #include "copy.h"
-#include "def.h"
+#include "constants.h"
 #include "exit-status.h"
 #include "extract-word.h"
 #include "fd-util.h"

diff --git a/src/ask-password/ask-password.c b/src/ask-password/ask-password.c
index a92adbfca5e7307bd48bdd25e22281cd3dd4a63d..f161e659730d863a66d36532fc5496e1b5be1dc3 100644 (file)
--- a/src/ask-password/ask-password.c
+++ b/src/ask-password/ask-password.c
@@ -7,7 +7,7 @@
 
 #include "ask-password-api.h"
 #include "build.h"
-#include "def.h"
+#include "constants.h"
 #include "log.h"
 #include "macro.h"
 #include "main-func.h"

diff --git a/src/basic/cgroup-util.c b/src/basic/cgroup-util.c
index b03cc70e2e6582a0c9cbbcc353ced1bb978ee60e..7949dd7d70ffb731ddace2e99aba066d5d701a65 100644 (file)
--- a/src/basic/cgroup-util.c
+++ b/src/basic/cgroup-util.c
@@ -12,7 +12,7 @@
 
 #include "alloc-util.h"
 #include "cgroup-util.h"
-#include "def.h"
+#include "constants.h"
 #include "dirent-util.h"
 #include "extract-word.h"
 #include "fd-util.h"

diff --git a/src/basic/cgroup-util.h b/src/basic/cgroup-util.h
index df6d5b7bbb423ee9612dc19ab5df0666ea6e1d66..c9aae5abf6272e1fd2d7ed71695f2c2d6f294d86 100644 (file)
--- a/src/basic/cgroup-util.h
+++ b/src/basic/cgroup-util.h
@@ -9,7 +9,7 @@
 #include <sys/statfs.h>
 #include <sys/types.h>
 
-#include "def.h"
+#include "constants.h"
 #include "set.h"
 
 #define SYSTEMD_CGROUP_CONTROLLER_LEGACY "name=systemd"

diff --git a/src/basic/conf-files.c b/src/basic/conf-files.c
index 532c9d19b83c91c9ab98a40233e295fe1fdd1c5e..348f7dcc7018a87dd6befe427d19a8ebda1ec154 100644 (file)
--- a/src/basic/conf-files.c
+++ b/src/basic/conf-files.c
@@ -7,7 +7,7 @@
 
 #include "chase-symlinks.h"
 #include "conf-files.h"
-#include "def.h"
+#include "constants.h"
 #include "dirent-util.h"
 #include "fd-util.h"
 #include "hashmap.h"

diff --git a/src/basic/def.h b/src/basic/constants.h
similarity index 84%
rename from src/basic/def.h
rename to src/basic/constants.h
index 2b4de29021a7eab930b17098a918e2156cd0d085..54021911ab31a35b0858490fcafc5e5caf9f9923 100644 (file)
--- a/src/basic/def.h
+++ b/src/basic/constants.h
@@ -1,6 +1,30 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
+#if !defined(HAS_FEATURE_MEMORY_SANITIZER)
+#  if defined(__has_feature)
+#    if __has_feature(memory_sanitizer)
+#      define HAS_FEATURE_MEMORY_SANITIZER 1
+#    endif
+#  endif
+#  if !defined(HAS_FEATURE_MEMORY_SANITIZER)
+#    define HAS_FEATURE_MEMORY_SANITIZER 0
+#  endif
+#endif
+
+#if !defined(HAS_FEATURE_ADDRESS_SANITIZER)
+#  ifdef __SANITIZE_ADDRESS__
+#      define HAS_FEATURE_ADDRESS_SANITIZER 1
+#  elif defined(__has_feature)
+#    if __has_feature(address_sanitizer)
+#      define HAS_FEATURE_ADDRESS_SANITIZER 1
+#    endif
+#  endif
+#  if !defined(HAS_FEATURE_ADDRESS_SANITIZER)
+#    define HAS_FEATURE_ADDRESS_SANITIZER 0
+#  endif
+#endif
+
 #define DEFAULT_TIMEOUT_USEC (90*USEC_PER_SEC)
 #define DEFAULT_RESTART_USEC (100*USEC_PER_MSEC)
 #define DEFAULT_CONFIRM_USEC (30*USEC_PER_SEC)

diff --git a/src/basic/locale-util.c b/src/basic/locale-util.c
index d8518ec06aad50b6fae7729a03e490a8910d5b6b..2f486a4d92ca0f2fb33d2509b881fe69410be373 100644 (file)
--- a/src/basic/locale-util.c
+++ b/src/basic/locale-util.c
@@ -10,7 +10,7 @@
 #include <sys/mman.h>
 #include <sys/stat.h>
 
-#include "def.h"
+#include "constants.h"
 #include "dirent-util.h"
 #include "env-util.h"
 #include "fd-util.h"

diff --git a/src/basic/macro.h b/src/basic/macro.h
index 237117db12a76f146dedde2a80fe00746f33ae2e..3d1b1751231b995979150617b636df9931c2b9bd 100644 (file)
--- a/src/basic/macro.h
+++ b/src/basic/macro.h
@@ -9,32 +9,9 @@
 #include <sys/sysmacros.h>
 #include <sys/types.h>
 
+#include "constants.h"
 #include "macro-fundamental.h"
 
-#if !defined(HAS_FEATURE_MEMORY_SANITIZER)
-#  if defined(__has_feature)
-#    if __has_feature(memory_sanitizer)
-#      define HAS_FEATURE_MEMORY_SANITIZER 1
-#    endif
-#  endif
-#  if !defined(HAS_FEATURE_MEMORY_SANITIZER)
-#    define HAS_FEATURE_MEMORY_SANITIZER 0
-#  endif
-#endif
-
-#if !defined(HAS_FEATURE_ADDRESS_SANITIZER)
-#  ifdef __SANITIZE_ADDRESS__
-#      define HAS_FEATURE_ADDRESS_SANITIZER 1
-#  elif defined(__has_feature)
-#    if __has_feature(address_sanitizer)
-#      define HAS_FEATURE_ADDRESS_SANITIZER 1
-#    endif
-#  endif
-#  if !defined(HAS_FEATURE_ADDRESS_SANITIZER)
-#    define HAS_FEATURE_ADDRESS_SANITIZER 0
-#  endif
-#endif
-
 /* Note: on GCC "no_sanitize_address" is a function attribute only, on llvm it may also be applied to global
  * variables. We define a specific macro which knows this. Note that on GCC we don't need this decorator so much, since
  * our primary usecase for this attribute is registration structures placed in named ELF sections which shall not be

diff --git a/src/basic/meson.build b/src/basic/meson.build
index a4d7cb5fb30e5dbb3d6d0567cff4bf4ac290092e..541031b8a3387535abf3ee51a6cd7103561efa17 100644 (file)
--- a/src/basic/meson.build
+++ b/src/basic/meson.build
@@ -33,7 +33,7 @@ basic_sources = files(
         'chattr-util.h',
         'conf-files.c',
         'conf-files.h',
-        'def.h',
+        'constants.h',
         'devnum-util.c',
         'devnum-util.h',
         'dirent-util.c',

diff --git a/src/basic/path-lookup.h b/src/basic/path-lookup.h
index aed72defe7788f467d7a25bc64c76a7cee7069ef..46eb32c4b0b6d5d551e3db1ff3b30c32de2bcc9f 100644 (file)
--- a/src/basic/path-lookup.h
+++ b/src/basic/path-lookup.h
@@ -3,7 +3,7 @@
 
 #include <stdbool.h>
 
-#include "def.h"
+#include "constants.h"
 #include "macro.h"
 
 typedef enum LookupPathsFlags {

diff --git a/src/basic/procfs-util.c b/src/basic/procfs-util.c
index 4f607307b61a9d4dedd206a7619ebd200368a85d..bcba5a5208a6da62f4a4647ae1808c6b30d9041e 100644 (file)
--- a/src/basic/procfs-util.c
+++ b/src/basic/procfs-util.c
@@ -4,7 +4,7 @@
 #include <unistd.h>
 
 #include "alloc-util.h"
-#include "def.h"
+#include "constants.h"
 #include "fd-util.h"
 #include "fileio.h"
 #include "parse-util.h"

diff --git a/src/basic/terminal-util.c b/src/basic/terminal-util.c
index 77f13c7bea0121cb2d20bb335a10ea2cb3c8d30a..8fa9986a768a4083be630510977d66646637f280 100644 (file)
--- a/src/basic/terminal-util.c
+++ b/src/basic/terminal-util.c
@@ -21,7 +21,7 @@
 #include <unistd.h>
 
 #include "alloc-util.h"
-#include "def.h"
+#include "constants.h"
 #include "devnum-util.h"
 #include "env-util.h"
 #include "fd-util.h"

diff --git a/src/binfmt/binfmt.c b/src/binfmt/binfmt.c
index 3fc954f7c619a7f8f8deee39bdf907629e22bf89..ba209a8d470a43e3903805edc99a375da73cae8a 100644 (file)
--- a/src/binfmt/binfmt.c
+++ b/src/binfmt/binfmt.c
@@ -13,7 +13,7 @@
 #include "binfmt-util.h"
 #include "build.h"
 #include "conf-files.h"
-#include "def.h"
+#include "constants.h"
 #include "fd-util.h"
 #include "fileio.h"
 #include "log.h"

diff --git a/src/core/execute.c b/src/core/execute.c
index 981bb63440cb1359db412fbc5a5a7868f4cd02f8..8e70ecab8219947a0d81b738e10fab44e4c90f1c 100644 (file)
--- a/src/core/execute.c
+++ b/src/core/execute.c
@@ -48,10 +48,10 @@
 #include "cgroup-setup.h"
 #include "chase-symlinks.h"
 #include "chown-recursive.h"
+#include "constants.h"
 #include "cpu-set-util.h"
 #include "creds-util.h"
 #include "data-fd-util.h"
-#include "def.h"
 #include "env-file.h"
 #include "env-util.h"
 #include "errno-list.h"

diff --git a/src/core/main.c b/src/core/main.c
index 4cf5dd146b3b81fa2e086dd5a11ffe4e31862dfe..cc725e6c42af33d20ceed618413d1303fedac07a 100644 (file)
--- a/src/core/main.c
+++ b/src/core/main.c
@@ -37,7 +37,7 @@
 #include "crash-handler.h"
 #include "dbus-manager.h"
 #include "dbus.h"
-#include "def.h"
+#include "constants.h"
 #include "dev-setup.h"
 #include "efi-random.h"
 #include "efivars.h"

diff --git a/src/core/manager.c b/src/core/manager.c
index 1473425e4e510e4c023ecaf7dac4087d034c9be3..ffaa9fa595b6057e3a043fd00474657f7ea74e5e 100644 (file)
--- a/src/core/manager.c
+++ b/src/core/manager.c
@@ -30,13 +30,13 @@
 #include "bus-util.h"
 #include "clean-ipc.h"
 #include "clock-util.h"
+#include "constants.h"
 #include "core-varlink.h"
 #include "creds-util.h"
 #include "dbus-job.h"
 #include "dbus-manager.h"
 #include "dbus-unit.h"
 #include "dbus.h"
-#include "def.h"
 #include "dirent-util.h"
 #include "env-util.h"
 #include "escape.h"

diff --git a/src/core/service.c b/src/core/service.c
index bd44c379534005ff664d9607fc2a11df23727e59..2c734eb0966e217bf3f8f73dfd7b1167d4e66e11 100644 (file)
--- a/src/core/service.c
+++ b/src/core/service.c
@@ -13,9 +13,9 @@
 #include "bus-kernel.h"
 #include "bus-util.h"
 #include "chase-symlinks.h"
+#include "constants.h"
 #include "dbus-service.h"
 #include "dbus-unit.h"
-#include "def.h"
 #include "env-util.h"
 #include "escape.h"
 #include "exit-status.h"

diff --git a/src/core/socket.c b/src/core/socket.c
index 2a8aa54f7f7e5e88ae759c0c391aa5b4f93f7c43..55847c2f7c73418ffa4115701664fa2312c29e2c 100644 (file)
--- a/src/core/socket.c
+++ b/src/core/socket.c
@@ -15,10 +15,10 @@
 #include "bus-error.h"
 #include "bus-util.h"
 #include "chase-symlinks.h"
+#include "constants.h"
 #include "copy.h"
 #include "dbus-socket.h"
 #include "dbus-unit.h"
-#include "def.h"
 #include "errno-list.h"
 #include "exit-status.h"
 #include "fd-util.h"

diff --git a/src/coredump/coredumpctl.c b/src/coredump/coredumpctl.c
index 9507374307f808cb24e9fe365da0bbe0f76098b1..a6abcc6496de3564b73f3f4a3d4e9b47f07842bf 100644 (file)
--- a/src/coredump/coredumpctl.c
+++ b/src/coredump/coredumpctl.c
@@ -17,7 +17,7 @@
 #include "bus-util.h"
 #include "chase-symlinks.h"
 #include "compress.h"
-#include "def.h"
+#include "constants.h"
 #include "dissect-image.h"
 #include "fd-util.h"
 #include "format-table.h"

diff --git a/src/environment-d-generator/environment-d-generator.c b/src/environment-d-generator/environment-d-generator.c
index e3fea1f2b07d440e1538fca9476c120d397b4707..90e31c98efa41074618b51a17bd77d9058e4d1ef 100644 (file)
--- a/src/environment-d-generator/environment-d-generator.c
+++ b/src/environment-d-generator/environment-d-generator.c
@@ -3,7 +3,7 @@
 #include "sd-path.h"
 
 #include "conf-files.h"
-#include "def.h"
+#include "constants.h"
 #include "env-file.h"
 #include "escape.h"
 #include "glyph-util.h"

diff --git a/src/home/homed-conf.c b/src/home/homed-conf.c
index 296e01449df0ba74d33d10542a2b4ef6282a02d3..429a6e3c555f0ff32de2f27786d2a3c459891de1 100644 (file)
--- a/src/home/homed-conf.c
+++ b/src/home/homed-conf.c
@@ -1,7 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
 #include "conf-parser.h"
-#include "def.h"
+#include "constants.h"
 #include "home-util.h"
 #include "homed-conf.h"
 

diff --git a/src/hostname/hostnamed.c b/src/hostname/hostnamed.c
index ee3ef047400b87f3b5c4bc14bfa8201c2354fb9e..f3d3131828afc57c8e20c84c685fa76c16ff3cb5 100644 (file)
--- a/src/hostname/hostnamed.c
+++ b/src/hostname/hostnamed.c
@@ -11,7 +11,7 @@
 #include "bus-get-properties.h"
 #include "bus-log-control-api.h"
 #include "bus-polkit.h"
-#include "def.h"
+#include "constants.h"
 #include "env-file-label.h"
 #include "env-file.h"
 #include "env-util.h"

diff --git a/src/import/importd.c b/src/import/importd.c
index a6efb5315d3e251c011a141d8ba0b0ee7060ee27..9a3ea131c122ad4cb65d6bc929cdd2bde925de91 100644 (file)
--- a/src/import/importd.c
+++ b/src/import/importd.c
@@ -10,7 +10,7 @@
 #include "bus-get-properties.h"
 #include "bus-log-control-api.h"
 #include "bus-polkit.h"
-#include "def.h"
+#include "constants.h"
 #include "env-util.h"
 #include "fd-util.h"
 #include "float.h"

diff --git a/src/initctl/initctl.c b/src/initctl/initctl.c
index e1b85d521835e1395645f7635429b32d09286ebb..74842000659faba2a45ec648bb2cac5eb7e5be22 100644 (file)
--- a/src/initctl/initctl.c
+++ b/src/initctl/initctl.c
@@ -14,8 +14,8 @@
 #include "alloc-util.h"
 #include "bus-error.h"
 #include "bus-util.h"
+#include "constants.h"
 #include "daemon-util.h"
-#include "def.h"
 #include "fd-util.h"
 #include "format-util.h"
 #include "initreq.h"

diff --git a/src/journal-remote/journal-remote-main.c b/src/journal-remote/journal-remote-main.c
index 1ebcb8ddceb408be3411ed3606aa6a07ee1c4cd9..440aad1cf7b29ac6ccc85190b40ba713dd3026d1 100644 (file)
--- a/src/journal-remote/journal-remote-main.c
+++ b/src/journal-remote/journal-remote-main.c
@@ -7,8 +7,8 @@
 
 #include "build.h"
 #include "conf-parser.h"
+#include "constants.h"
 #include "daemon-util.h"
-#include "def.h"
 #include "fd-util.h"
 #include "fileio.h"
 #include "journal-remote-write.h"

diff --git a/src/journal-remote/journal-remote.c b/src/journal-remote/journal-remote.c
index e8fe04165e07c7fd6d6fc1021de5e5c63e1f387d..3d7b552e95e90f3eab451bf656fb2cc7ab916121 100644 (file)
--- a/src/journal-remote/journal-remote.c
+++ b/src/journal-remote/journal-remote.c
@@ -10,7 +10,7 @@
 
 #include "af-list.h"
 #include "alloc-util.h"
-#include "def.h"
+#include "constants.h"
 #include "errno-util.h"
 #include "escape.h"
 #include "fd-util.h"

diff --git a/src/journal-remote/journal-upload.c b/src/journal-remote/journal-upload.c
index 6d58e48bbfbf36664b9ba422db45d7da81db11e2..5a34b73f7614d66b81cc1ec535e9608c530c37ff 100644 (file)
--- a/src/journal-remote/journal-upload.c
+++ b/src/journal-remote/journal-upload.c
@@ -12,8 +12,8 @@
 #include "alloc-util.h"
 #include "build.h"
 #include "conf-parser.h"
+#include "constants.h"
 #include "daemon-util.h"
-#include "def.h"
 #include "env-file.h"
 #include "fd-util.h"
 #include "fileio.h"

diff --git a/src/journal/journalctl.c b/src/journal/journalctl.c
index 7de1bd557a50d9eabc6397483ba93fec0fc0979b..eb8106cbb41fadb28a11ef69d1de862ac1d5a0d9 100644 (file)
--- a/src/journal/journalctl.c
+++ b/src/journal/journalctl.c
@@ -25,7 +25,7 @@
 #include "catalog.h"
 #include "chase-symlinks.h"
 #include "chattr-util.h"
-#include "def.h"
+#include "constants.h"
 #include "dissect-image.h"
 #include "fd-util.h"
 #include "fileio.h"

diff --git a/src/libsystemd/sd-bus/bus-internal.h b/src/libsystemd/sd-bus/bus-internal.h
index 51673ad1c5c81f8b1dd557a828d050f570eb2296..dda6adfd48316b5c4693e948e0c25d209647155c 100644 (file)
--- a/src/libsystemd/sd-bus/bus-internal.h
+++ b/src/libsystemd/sd-bus/bus-internal.h
@@ -8,7 +8,7 @@
 #include "bus-error.h"
 #include "bus-kernel.h"
 #include "bus-match.h"
-#include "def.h"
+#include "constants.h"
 #include "hashmap.h"
 #include "list.h"
 #include "prioq.h"

diff --git a/src/libsystemd/sd-bus/sd-bus.c b/src/libsystemd/sd-bus/sd-bus.c
index 3803a2c4c4b4df64b24d7c4bfc973a65e4a71479..7e72245e8dca2c48d706b22440a44f5348321f2a 100644 (file)
--- a/src/libsystemd/sd-bus/sd-bus.c
+++ b/src/libsystemd/sd-bus/sd-bus.c
@@ -27,7 +27,7 @@
 #include "bus-track.h"
 #include "bus-type.h"
 #include "cgroup-util.h"
-#include "def.h"
+#include "constants.h"
 #include "errno-util.h"
 #include "fd-util.h"
 #include "glyph-util.h"

diff --git a/src/libsystemd/sd-bus/test-bus-benchmark.c b/src/libsystemd/sd-bus/test-bus-benchmark.c
index f9595e3477058d2537c601f10a24aad8249668e0..7d7dc390dd51442a35f500d92d89191f84feefc8 100644 (file)
--- a/src/libsystemd/sd-bus/test-bus-benchmark.c
+++ b/src/libsystemd/sd-bus/test-bus-benchmark.c
@@ -8,7 +8,7 @@
 #include "alloc-util.h"
 #include "bus-internal.h"
 #include "bus-kernel.h"
-#include "def.h"
+#include "constants.h"
 #include "fd-util.h"
 #include "missing_resource.h"
 #include "string-util.h"

diff --git a/src/libsystemd/sd-hwdb/hwdb-internal.h b/src/libsystemd/sd-hwdb/hwdb-internal.h
index 62d27f7b8968d5563769cc12ac49b22cc800add4..5302679a625274ec6c4a62855917ad08d7bf048c 100644 (file)
--- a/src/libsystemd/sd-hwdb/hwdb-internal.h
+++ b/src/libsystemd/sd-hwdb/hwdb-internal.h
@@ -4,7 +4,7 @@
 #include <stdint.h>
 #include <sys/stat.h>
 
-#include "def.h"
+#include "constants.h"
 #include "hashmap.h"
 #include "sparse-endian.h"
 

diff --git a/src/locale/localed.c b/src/locale/localed.c
index 7aa47f18c226caeccfd493415147e3af0980b335..a2014e3da0fbabb6575adb587749ece0f7f96490 100644 (file)
--- a/src/locale/localed.c
+++ b/src/locale/localed.c
@@ -17,7 +17,7 @@
 #include "bus-log-control-api.h"
 #include "bus-message.h"
 #include "bus-polkit.h"
-#include "def.h"
+#include "constants.h"
 #include "dlfcn-util.h"
 #include "kbd-util.h"
 #include "localed-util.h"

diff --git a/src/login/logind.c b/src/login/logind.c
index cdca5ca58ce1eb9394e836718c6e48a80e54ba89..cc153fd6bfd3c0014e4093b3bd7c7bd876957d51 100644 (file)
--- a/src/login/logind.c
+++ b/src/login/logind.c
@@ -14,8 +14,8 @@
 #include "bus-log-control-api.h"
 #include "bus-polkit.h"
 #include "cgroup-util.h"
+#include "constants.h"
 #include "daemon-util.h"
-#include "def.h"
 #include "device-util.h"
 #include "dirent-util.h"
 #include "fd-util.h"

diff --git a/src/machine/machinectl.c b/src/machine/machinectl.c
index a1671e3252345f1c6f8fd5de2a623b38773f756b..af0f5d861206a9837eb84f2d1288e4f1aeac2680 100644 (file)
--- a/src/machine/machinectl.c
+++ b/src/machine/machinectl.c
@@ -25,8 +25,8 @@
 #include "bus-wait-for-jobs.h"
 #include "cgroup-show.h"
 #include "cgroup-util.h"
+#include "constants.h"
 #include "copy.h"
-#include "def.h"
 #include "env-util.h"
 #include "fd-util.h"
 #include "format-table.h"

diff --git a/src/modules-load/modules-load.c b/src/modules-load/modules-load.c
index f8f0eb49004c1a093d6a5ce6acd8a8a67ce8b303..8e7f7a5ebae044eade763a27d2db414339524f36 100644 (file)
--- a/src/modules-load/modules-load.c
+++ b/src/modules-load/modules-load.c
@@ -7,7 +7,7 @@
 
 #include "build.h"
 #include "conf-files.h"
-#include "def.h"
+#include "constants.h"
 #include "fd-util.h"
 #include "fileio.h"
 #include "log.h"

diff --git a/src/network/networkd-conf.c b/src/network/networkd-conf.c
index 9190dbfc53ae28f243597a5809036514bdd2c4b3..f73b2d43c708179ae9d772722b58b4e3bfefbd38 100644 (file)
--- a/src/network/networkd-conf.c
+++ b/src/network/networkd-conf.c
@@ -4,7 +4,7 @@
  ***/
 
 #include "conf-parser.h"
-#include "def.h"
+#include "constants.h"
 #include "networkd-conf.h"
 #include "networkd-manager.h"
 #include "networkd-speed-meter.h"

diff --git a/src/network/networkd-manager.c b/src/network/networkd-manager.c
index 2db8bb6074fc047e7f415b551a2b94b1adfb3948..f3ebeadd2cd8c5add0aa27c42ecddbf66d2177d9 100644 (file)
--- a/src/network/networkd-manager.c
+++ b/src/network/networkd-manager.c
@@ -17,8 +17,8 @@
 #include "bus-polkit.h"
 #include "bus-util.h"
 #include "conf-parser.h"
+#include "constants.h"
 #include "daemon-util.h"
-#include "def.h"
 #include "device-private.h"
 #include "device-util.h"
 #include "dns-domain.h"

diff --git a/src/nspawn/nspawn-setuid.c b/src/nspawn/nspawn-setuid.c
index 475147c2a02259f1d8bbd401d932283cf3be4d1a..54f56725a8573d2bf8a126a1856e7e88a9d8b44f 100644 (file)
--- a/src/nspawn/nspawn-setuid.c
+++ b/src/nspawn/nspawn-setuid.c
@@ -5,7 +5,7 @@
 #include <unistd.h>
 
 #include "alloc-util.h"
-#include "def.h"
+#include "constants.h"
 #include "errno.h"
 #include "fd-util.h"
 #include "fileio.h"

diff --git a/src/nspawn/nspawn-stub-pid1.c b/src/nspawn/nspawn-stub-pid1.c
index cea5f94b2e9184800fd3370c7965b28aa6dcad7c..47f7155b195c19a2e05c12d229c10c53a96d251f 100644 (file)
--- a/src/nspawn/nspawn-stub-pid1.c
+++ b/src/nspawn/nspawn-stub-pid1.c
@@ -7,7 +7,7 @@
 #include <unistd.h>
 
 #include "argv-util.h"
-#include "def.h"
+#include "constants.h"
 #include "exit-status.h"
 #include "fd-util.h"
 #include "log.h"

diff --git a/src/partition/repart.c b/src/partition/repart.c
index 51fdaabc42a9556c874600c4dd464a0a25fd4818..a037d7be1d22b0acf3dfccf34a33ec6bf045f517 100644 (file)
--- a/src/partition/repart.c
+++ b/src/partition/repart.c
@@ -23,8 +23,8 @@
 #include "chase-symlinks.h"
 #include "conf-files.h"
 #include "conf-parser.h"
+#include "constants.h"
 #include "cryptsetup-util.h"
-#include "def.h"
 #include "device-util.h"
 #include "devnum-util.h"
 #include "dirent-util.h"

diff --git a/src/portable/portable.c b/src/portable/portable.c
index be906f786cd385f958878df2f1493472b9ee2791..dd0f6d3d1303c4ec994c50e7a67ff064829aca90 100644 (file)
--- a/src/portable/portable.c
+++ b/src/portable/portable.c
@@ -8,7 +8,7 @@
 #include "conf-files.h"
 #include "copy.h"
 #include "data-fd-util.h"
-#include "def.h"
+#include "constants.h"
 #include "dirent-util.h"
 #include "discover-image.h"
 #include "dissect-image.h"

diff --git a/src/portable/portablectl.c b/src/portable/portablectl.c
index d0d7bb1caf475bc4882bdb58addbb09540c58030..ff71535c13541cc0deda0281597bf742d2f183a0 100644 (file)
--- a/src/portable/portablectl.c
+++ b/src/portable/portablectl.c
@@ -12,7 +12,7 @@
 #include "bus-unit-util.h"
 #include "bus-wait-for-jobs.h"
 #include "chase-symlinks.h"
-#include "def.h"
+#include "constants.h"
 #include "dirent-util.h"
 #include "env-file.h"
 #include "fd-util.h"

diff --git a/src/portable/portabled.c b/src/portable/portabled.c
index 2f9afdc8f275e5bf01a29c573471c979e86a4f67..a4fae65e7e1c379f6fda1318d815b1532f40206c 100644 (file)
--- a/src/portable/portabled.c
+++ b/src/portable/portabled.c
@@ -8,8 +8,8 @@
 #include "alloc-util.h"
 #include "bus-log-control-api.h"
 #include "bus-polkit.h"
+#include "constants.h"
 #include "daemon-util.h"
-#include "def.h"
 #include "main-func.h"
 #include "portabled-bus.h"
 #include "portabled-image-bus.h"

diff --git a/src/resolve/resolvconf-compat.c b/src/resolve/resolvconf-compat.c
index 0a0b97fa015c9f0e3f952b4c1a1b22cc3db3d52a..3804d3dde3b7e41ef7bab1dd105793d18922b4c1 100644 (file)
--- a/src/resolve/resolvconf-compat.c
+++ b/src/resolve/resolvconf-compat.c
@@ -5,7 +5,7 @@
 
 #include "alloc-util.h"
 #include "build.h"
-#include "def.h"
+#include "constants.h"
 #include "dns-domain.h"
 #include "extract-word.h"
 #include "fileio.h"

diff --git a/src/resolve/resolved-conf.c b/src/resolve/resolved-conf.c
index 6fd193a7cb7e37dbc65a62159925e2232c31f240..2be5986f9b729ac75e6cc82ce6ce358d5b92d3d6 100644 (file)
--- a/src/resolve/resolved-conf.c
+++ b/src/resolve/resolved-conf.c
@@ -2,7 +2,7 @@
 
 #include "alloc-util.h"
 #include "conf-parser.h"
-#include "def.h"
+#include "constants.h"
 #include "extract-word.h"
 #include "hexdecoct.h"
 #include "parse-util.h"

diff --git a/src/resolve/resolved-dns-trust-anchor.c b/src/resolve/resolved-dns-trust-anchor.c
index 69a484dc1293278d1e39e29368311b50578c5206..828045f68fb878e728839b4848d9e8dc8bde6982 100644 (file)
--- a/src/resolve/resolved-dns-trust-anchor.c
+++ b/src/resolve/resolved-dns-trust-anchor.c
@@ -4,7 +4,7 @@
 
 #include "alloc-util.h"
 #include "conf-files.h"
-#include "def.h"
+#include "constants.h"
 #include "dns-domain.h"
 #include "fd-util.h"
 #include "fileio.h"

diff --git a/src/resolve/resolved-dnssd.c b/src/resolve/resolved-dnssd.c
index 464892a8fe03ce411ef056cd256e994d3e67a983..f5a8a80ebc8b41b46f3f0d1224bc16a61974d5d2 100644 (file)
--- a/src/resolve/resolved-dnssd.c
+++ b/src/resolve/resolved-dnssd.c
@@ -2,7 +2,7 @@
 
 #include "conf-files.h"
 #include "conf-parser.h"
-#include "def.h"
+#include "constants.h"
 #include "resolved-dnssd.h"
 #include "resolved-dns-rr.h"
 #include "resolved-manager.h"

diff --git a/src/shared/ask-password-api.c b/src/shared/ask-password-api.c
index 17474fe0be388e5aa25af52668b900ca70c0343a..84d7b31bad7db78d33e03b7fb0cd050566780ed0 100644 (file)
--- a/src/shared/ask-password-api.c
+++ b/src/shared/ask-password-api.c
@@ -20,8 +20,8 @@
 
 #include "alloc-util.h"
 #include "ask-password-api.h"
+#include "constants.h"
 #include "creds-util.h"
-#include "def.h"
 #include "fd-util.h"
 #include "fileio.h"
 #include "format-util.h"

diff --git a/src/shared/conf-parser.c b/src/shared/conf-parser.c
index 5cb41a39da2fc391fc15c1777f69118c5ab515ac..69932865ba59fc33ceddd8e30012e8847288228c 100644 (file)
--- a/src/shared/conf-parser.c
+++ b/src/shared/conf-parser.c
@@ -10,7 +10,7 @@
 #include "alloc-util.h"
 #include "conf-files.h"
 #include "conf-parser.h"
-#include "def.h"
+#include "constants.h"
 #include "dns-domain.h"
 #include "escape.h"
 #include "ether-addr-util.h"

diff --git a/src/shared/creds-util.c b/src/shared/creds-util.c
index ecf90e2084a1152ef397e4a867c5aedb8384fde8..f6811ce9aa7ea797bfd561cbdbb84ec063a4f526 100644 (file)
--- a/src/shared/creds-util.c
+++ b/src/shared/creds-util.c
@@ -10,8 +10,8 @@
 
 #include "blockdev-util.h"
 #include "chattr-util.h"
+#include "constants.h"
 #include "creds-util.h"
-#include "def.h"
 #include "efi-api.h"
 #include "env-util.h"
 #include "fd-util.h"

diff --git a/src/shared/dissect-image.c b/src/shared/dissect-image.c
index cfa7d7e0f392c3f73be65cfc621d7d711b4584c4..101db51a13ab94f6d79e0f90c4d8d4aaf43fe3c4 100644 (file)
--- a/src/shared/dissect-image.c
+++ b/src/shared/dissect-image.c
@@ -27,9 +27,9 @@
 #include "blockdev-util.h"
 #include "chase-symlinks.h"
 #include "conf-files.h"
+#include "constants.h"
 #include "copy.h"
 #include "cryptsetup-util.h"
-#include "def.h"
 #include "device-nodes.h"
 #include "device-util.h"
 #include "devnum-util.h"

diff --git a/src/shared/install.c b/src/shared/install.c
index 834a1c59e33b5615568a788725705d1cf01c172e..51aa60bb5253cf8e4bca64b52a7068af7e2af8bb 100644 (file)
--- a/src/shared/install.c
+++ b/src/shared/install.c
@@ -13,7 +13,7 @@
 #include "chase-symlinks.h"
 #include "conf-files.h"
 #include "conf-parser.h"
-#include "def.h"
+#include "constants.h"
 #include "dirent-util.h"
 #include "errno-list.h"
 #include "extract-word.h"

diff --git a/src/shared/killall.c b/src/shared/killall.c
index 133b0e28d68ee151a474c557488be335158db268..0b5a6642ec23e51f863553130f1161c314c18cc9 100644 (file)
--- a/src/shared/killall.c
+++ b/src/shared/killall.c
@@ -9,7 +9,7 @@
 #include <unistd.h>
 
 #include "alloc-util.h"
-#include "def.h"
+#include "constants.h"
 #include "dirent-util.h"
 #include "fd-util.h"
 #include "format-util.h"

diff --git a/src/shared/pretty-print.c b/src/shared/pretty-print.c
index f1658395369983b22c0310fb516d9d027b409e04..90f258f5bfa1ab6f04e8c30f205def26210dc0b6 100644 (file)
--- a/src/shared/pretty-print.c
+++ b/src/shared/pretty-print.c
@@ -6,7 +6,7 @@
 
 #include "alloc-util.h"
 #include "conf-files.h"
-#include "def.h"
+#include "constants.h"
 #include "env-util.h"
 #include "fd-util.h"
 #include "fileio.h"

diff --git a/src/shared/sleep-config.c b/src/shared/sleep-config.c
index efc066c4f2e9cf859ebee6f67be46a8dab895f63..0b1470ca01361832ac40c4d184b8382f84ae90fa 100644 (file)
--- a/src/shared/sleep-config.c
+++ b/src/shared/sleep-config.c
@@ -21,7 +21,7 @@
 #include "blockdev-util.h"
 #include "btrfs-util.h"
 #include "conf-parser.h"
-#include "def.h"
+#include "constants.h"
 #include "device-util.h"
 #include "devnum-util.h"
 #include "env-util.h"

diff --git a/src/shared/tpm2-util.c b/src/shared/tpm2-util.c
index 65e8d48347959d7000c66b43c1b69b05fe04d776..ba8a23e18cad7efc96df885555c670662d50e13d 100644 (file)
--- a/src/shared/tpm2-util.c
+++ b/src/shared/tpm2-util.c
@@ -1,8 +1,8 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
 #include "alloc-util.h"
+#include "constants.h"
 #include "cryptsetup-util.h"
-#include "def.h"
 #include "dirent-util.h"
 #include "dlfcn-util.h"
 #include "efi-api.h"

diff --git a/src/shared/userdb-dropin.h b/src/shared/userdb-dropin.h
index 94cdd1517bdd8570ae45721090c27a676978f164..fad3981f7c6bc5d3dde7bed2268eb0aabd8cbb8e 100644 (file)
--- a/src/shared/userdb-dropin.h
+++ b/src/shared/userdb-dropin.h
@@ -1,7 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
-#include "def.h"
+#include "constants.h"
 #include "group-record.h"
 #include "user-record.h"
 #include "userdb.h"

diff --git a/src/shutdown/shutdown.c b/src/shutdown/shutdown.c
index 906ebabbfcb65e4663d3173f375ea35f6f77f01f..d0120bb85d7ad38f1b206eb6f4abb1c450b107e6 100644 (file)
--- a/src/shutdown/shutdown.c
+++ b/src/shutdown/shutdown.c
@@ -20,7 +20,7 @@
 #include "cgroup-setup.h"
 #include "cgroup-util.h"
 #include "coredump-util.h"
-#include "def.h"
+#include "constants.h"
 #include "errno-util.h"
 #include "exec-util.h"
 #include "fd-util.h"

diff --git a/src/shutdown/umount.c b/src/shutdown/umount.c
index c442f5544b5e42f7ac5cab5d575a4572220f8445..c6fa64c344b55828e7f9d9fe7c78fdbcb310e44c 100644 (file)
--- a/src/shutdown/umount.c
+++ b/src/shutdown/umount.c
@@ -23,7 +23,7 @@
 
 #include "alloc-util.h"
 #include "blockdev-util.h"
-#include "def.h"
+#include "constants.h"
 #include "device-util.h"
 #include "dirent-util.h"
 #include "escape.h"

diff --git a/src/sleep/sleep.c b/src/sleep/sleep.c
index 4d5b9d55794cd5be0dd45a2a4dd256ebd5e27ed3..6785ae2330af61f7ed090e4340c4edb8c7c8f81d 100644 (file)
--- a/src/sleep/sleep.c
+++ b/src/sleep/sleep.c
@@ -22,7 +22,7 @@
 #include "bus-error.h"
 #include "bus-locator.h"
 #include "bus-util.h"
-#include "def.h"
+#include "constants.h"
 #include "exec-util.h"
 #include "fd-util.h"
 #include "fileio.h"

diff --git a/src/sulogin-shell/sulogin-shell.c b/src/sulogin-shell/sulogin-shell.c
index 5648dfd83baaa321914f5a201150c7e241a966b2..6161e134e182761e77c2b1add897fa48e08e8875 100644 (file)
--- a/src/sulogin-shell/sulogin-shell.c
+++ b/src/sulogin-shell/sulogin-shell.c
@@ -11,7 +11,7 @@
 #include "bus-locator.h"
 #include "bus-util.h"
 #include "bus-error.h"
-#include "def.h"
+#include "constants.h"
 #include "env-util.h"
 #include "log.h"
 #include "process-util.h"

diff --git a/src/sysctl/sysctl.c b/src/sysctl/sysctl.c
index 34f0182fc933fef720531f8d94591a964ae57bd8..d752ad274244b8e6867846a0eaaa22521558f30f 100644 (file)
--- a/src/sysctl/sysctl.c
+++ b/src/sysctl/sysctl.c
@@ -11,8 +11,8 @@
 
 #include "build.h"
 #include "conf-files.h"
+#include "constants.h"
 #include "creds-util.h"
-#include "def.h"
 #include "errno-util.h"
 #include "fd-util.h"
 #include "fileio.h"

diff --git a/src/sysupdate/sysupdate.c b/src/sysupdate/sysupdate.c
index 14a3cf95d728c373b66363fbaff50d651414dd76..f6e89130bc3965fee40666aedf85e3d34446fa1f 100644 (file)
--- a/src/sysupdate/sysupdate.c
+++ b/src/sysupdate/sysupdate.c
@@ -8,7 +8,7 @@
 #include "bus-locator.h"
 #include "chase-symlinks.h"
 #include "conf-files.h"
-#include "def.h"
+#include "constants.h"
 #include "dirent-util.h"
 #include "dissect-image.h"
 #include "fd-util.h"

diff --git a/src/sysusers/sysusers.c b/src/sysusers/sysusers.c
index a520d76dce9b23fb58c82d81e5b1b598e4da4cc7..b68a7d6d5ac31d3a56fd4fe83d0199eb8db841ea 100644 (file)
--- a/src/sysusers/sysusers.c
+++ b/src/sysusers/sysusers.c
@@ -7,9 +7,9 @@
 #include "build.h"
 #include "chase-symlinks.h"
 #include "conf-files.h"
+#include "constants.h"
 #include "copy.h"
 #include "creds-util.h"
-#include "def.h"
 #include "dissect-image.h"
 #include "env-util.h"
 #include "fd-util.h"

diff --git a/src/test/test-ellipsize.c b/src/test/test-ellipsize.c
index b10db0ae9dd14ac6efc355fbfb28011f868313a1..2b27b44efb1ae5d14c8e23cb24aabf51079d645e 100644 (file)
--- a/src/test/test-ellipsize.c
+++ b/src/test/test-ellipsize.c
@@ -3,7 +3,7 @@
 #include <stdio.h>
 
 #include "alloc-util.h"
-#include "def.h"
+#include "constants.h"
 #include "string-util.h"
 #include "strv.h"
 #include "terminal-util.h"

diff --git a/src/test/test-exec-util.c b/src/test/test-exec-util.c
index bae06a81ad93f0290fc316c5b9687570b0a25454..2304f6a8b6751c9e52b56e8bfeb96c46b5bc3a03 100644 (file)
--- a/src/test/test-exec-util.c
+++ b/src/test/test-exec-util.c
@@ -7,7 +7,7 @@
 
 #include "alloc-util.h"
 #include "copy.h"
-#include "def.h"
+#include "constants.h"
 #include "env-util.h"
 #include "exec-util.h"
 #include "fd-util.h"

diff --git a/src/test/test-mountpoint-util.c b/src/test/test-mountpoint-util.c
index 391e1c97ba659ae19d8320c97521e466abff2f30..ccf18ecd9c5e2a010e79fb649b149dd9034cbf78 100644 (file)
--- a/src/test/test-mountpoint-util.c
+++ b/src/test/test-mountpoint-util.c
@@ -5,7 +5,7 @@
 #include <unistd.h>
 
 #include "alloc-util.h"
-#include "def.h"
+#include "constants.h"
 #include "fd-util.h"
 #include "fileio.h"
 #include "hashmap.h"

diff --git a/src/timedate/timedated.c b/src/timedate/timedated.c
index 373574cc06ca022d7872b0253d0d7a8b87a18c47..ad483301ef14d348d5ab036f762ea4328588e328 100644 (file)
--- a/src/timedate/timedated.c
+++ b/src/timedate/timedated.c
@@ -20,7 +20,7 @@
 #include "bus-polkit.h"
 #include "clock-util.h"
 #include "conf-files.h"
-#include "def.h"
+#include "constants.h"
 #include "fd-util.h"
 #include "fileio-label.h"
 #include "fileio.h"

diff --git a/src/timesync/timesyncd-conf.c b/src/timesync/timesyncd-conf.c
index 21fe7daec43c466bde0d1d4da648ceff1dab04cd..3e6cb435976f27a20af46cbd5231adf25640e284 100644 (file)
--- a/src/timesync/timesyncd-conf.c
+++ b/src/timesync/timesyncd-conf.c
@@ -1,7 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
 #include "alloc-util.h"
-#include "def.h"
+#include "constants.h"
 #include "dns-domain.h"
 #include "extract-word.h"
 #include "string-util.h"

diff --git a/src/tmpfiles/tmpfiles.c b/src/tmpfiles/tmpfiles.c
index 06328d495900f73cbee3f93eec7f89a788093358..1fec6d48319fcf4d69c14fe135f32cfa1e5bbf75 100644 (file)
--- a/src/tmpfiles/tmpfiles.c
+++ b/src/tmpfiles/tmpfiles.c
@@ -25,9 +25,9 @@
 #include "chase-symlinks.h"
 #include "chattr-util.h"
 #include "conf-files.h"
+#include "constants.h"
 #include "copy.h"
 #include "creds-util.h"
-#include "def.h"
 #include "devnum-util.h"
 #include "dirent-util.h"
 #include "dissect-image.h"

diff --git a/src/tty-ask-password-agent/tty-ask-password-agent.c b/src/tty-ask-password-agent/tty-ask-password-agent.c
index 50b6776039feb57bf99b3bbe922e82fcafc845a8..c7609d7d79ddbd99ef608219ac33942fa5c4d918 100644 (file)
--- a/src/tty-ask-password-agent/tty-ask-password-agent.c
+++ b/src/tty-ask-password-agent/tty-ask-password-agent.c
@@ -20,7 +20,7 @@
 #include "ask-password-api.h"
 #include "build.h"
 #include "conf-parser.h"
-#include "def.h"
+#include "constants.h"
 #include "dirent-util.h"
 #include "exit-status.h"
 #include "fd-util.h"

diff --git a/src/udev/net/link-config.c b/src/udev/net/link-config.c
index e408725b087187e436d8e6dbba9fd7b489eb5c5f..1fbfc58c0d2812b7d0bce5a3eb2490b84e979f04 100644 (file)
--- a/src/udev/net/link-config.c
+++ b/src/udev/net/link-config.c
@@ -11,8 +11,8 @@
 #include "arphrd-util.h"
 #include "conf-files.h"
 #include "conf-parser.h"
+#include "constants.h"
 #include "creds-util.h"
-#include "def.h"
 #include "device-private.h"
 #include "device-util.h"
 #include "ethtool-util.h"

diff --git a/src/udev/udev-rules.c b/src/udev/udev-rules.c
index f44a174d1f309450f4f06a2f55eff8f98a388f1a..5f837f4c31e649c7bd023a84dcb55022bb231135 100644 (file)
--- a/src/udev/udev-rules.c
+++ b/src/udev/udev-rules.c
@@ -6,7 +6,7 @@
 #include "architecture.h"
 #include "conf-files.h"
 #include "conf-parser.h"
-#include "def.h"
+#include "constants.h"
 #include "device-private.h"
 #include "device-util.h"
 #include "dirent-util.h"