Merge pull request #6974 from keszybz/clean-up-defines

Clean up define definitions

diff --cc src/basic/hashmap.c
Simple merge

diff --cc src/basic/process-util.c
Simple merge

diff --cc src/basic/socket-util.c
Simple merge

diff --cc src/basic/string-util.c
Simple merge

diff --cc src/core/execute.c
Simple merge

diff --cc src/core/load-fragment.c
Simple merge

diff --cc src/core/main.c
Simple merge

diff --cc src/core/manager.c
Simple merge

diff --cc src/fsck/fsck.c
Simple merge

diff --cc src/journal/compress.c
Simple merge

diff --cc src/journal/journalctl.c
Simple merge

diff --cc src/journal/journald-native.c
Simple merge

diff --cc src/journal/journald-server.c
Simple merge

diff --cc src/journal/sd-journal.c
Simple merge

diff --cc src/journal/test-compress.c
Simple merge

diff --cc src/resolve/resolved-dns-dnssec.c
Simple merge

diff --cc src/resolve/resolved-manager.c
Simple merge

diff --cc src/shared/dissect-image.c
Simple merge

diff --cc src/shared/dns-domain.c
Simple merge

diff --cc src/shared/path-lookup.c
Simple merge

diff --cc src/systemctl/systemctl.c
Simple merge

diff --cc src/sysusers/sysusers.c
Simple merge

diff --cc src/test/test-nss.c
Simple merge

diff --cc src/tmpfiles/tmpfiles.c
Simple merge

diff --cc src/update-utmp/update-utmp.c
Simple merge