From 2d860b3f05a458232a81832ca75e09afd6e2017d Mon Sep 17 00:00:00 2001
From: Thomas Haller <thaller@redhat.com>
Date: Sun, 11 Jan 2015 21:44:30 +0100
Subject: [PATCH] dhcp: comment-out unused systemd utility functions

---
 src/dhcp-manager/systemd-dhcp/src/shared/macro.h | 2 +-
 src/dhcp-manager/systemd-dhcp/src/shared/util.c  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/dhcp-manager/systemd-dhcp/src/shared/macro.h b/src/dhcp-manager/systemd-dhcp/src/shared/macro.h
index 34fc25fcf7..c495587b91 100644
--- a/src/dhcp-manager/systemd-dhcp/src/shared/macro.h
+++ b/src/dhcp-manager/systemd-dhcp/src/shared/macro.h
@@ -410,6 +410,7 @@ do {                                                                    \
                 _found;                                                 \
         })
 
+#if 0 /* NM_IGNORED */
 /* Return a nulstr for a standard cascade of configuration directories,
  * suitable to pass to conf_files_list_nulstr or config_parse_many. */
 #define CONF_DIRS_NULSTR(n) \
@@ -425,7 +426,6 @@ do {                                                                    \
 #define CONF_DIR_SPLIT_USR(n)
 #endif
 
-#if 0 /* NM_IGNORED */
 /* Define C11 thread_local attribute even on older gcc compiler
  * version */
 #ifndef thread_local
diff --git a/src/dhcp-manager/systemd-dhcp/src/shared/util.c b/src/dhcp-manager/systemd-dhcp/src/shared/util.c
index 3e7b270e5a..3ac18a7ef0 100644
--- a/src/dhcp-manager/systemd-dhcp/src/shared/util.c
+++ b/src/dhcp-manager/systemd-dhcp/src/shared/util.c
@@ -917,7 +917,6 @@ int get_process_gid(pid_t pid, gid_t *gid) {
         assert_cc(sizeof(uid_t) == sizeof(gid_t));
         return get_process_id(pid, "Gid:", gid);
 }
-#endif /* NM_IGNORED */
 
 int get_process_cwd(pid_t pid, char **cwd) {
         const char *p;
@@ -971,6 +970,7 @@ int get_process_environ(pid_t pid, char **env) {
 
         return 0;
 }
+#endif /* NM_IGNORED */
 
 char *strnappend(const char *s, const char *suffix, size_t b) {
         size_t a;