summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Coppa <dcoppa@gmail.com>2013-07-03 09:38:35 +0200
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2013-07-03 09:09:36 -0400
commit286ca4852eb2efc5c8c405e585b4e886c538f538 (patch)
treee6d79f4f0790cdc4e59599420f3584949fa38332
parent409dee2e44e7dc73d6bf00d782938e4cb4105f5b (diff)
build-sys: rename LEGACY to NOLEGACY to better reflect meaning
https://bugs.freedesktop.org/show_bug.cgi?id=66542
-rw-r--r--src/cgroups-agent/cgroups-agent.c4
-rw-r--r--src/systemctl/systemctl.c4
2 files changed, 4 insertions, 4 deletions
diff --git a/src/cgroups-agent/cgroups-agent.c b/src/cgroups-agent/cgroups-agent.c
index 7a6173e2a2..0e3d2b7541 100644
--- a/src/cgroups-agent/cgroups-agent.c
+++ b/src/cgroups-agent/cgroups-agent.c
@@ -49,7 +49,7 @@ int main(int argc, char *argv[]) {
* are called when the dbus service is shut down. */
if (!(bus = dbus_connection_open_private("unix:path=/run/systemd/private", &error))) {
-#ifndef LEGACY
+#ifndef NOLEGACY
dbus_error_free(&error);
/* Retry with the pre v21 socket name, to ease upgrades */
@@ -58,7 +58,7 @@ int main(int argc, char *argv[]) {
log_error("Failed to get D-Bus connection: %s", bus_error_message(&error));
goto finish;
}
-#ifndef LEGACY
+#ifndef NOLEGACY
}
#endif
diff --git a/src/systemctl/systemctl.c b/src/systemctl/systemctl.c
index 7436d4e875..04464deec8 100644
--- a/src/systemctl/systemctl.c
+++ b/src/systemctl/systemctl.c
@@ -1565,7 +1565,7 @@ static DBusHandlerResult wait_filter(DBusConnection *connection, DBusMessage *me
return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
}
-#ifndef LEGACY
+#ifndef NOLEGACY
dbus_error_free(&error);
if (dbus_message_get_args(message, &error,
DBUS_TYPE_UINT32, &id,
@@ -2916,7 +2916,7 @@ static int status_property(const char *name, DBusMessageIter *iter, UnitStatusIn
i->fragment_path = s;
else if (streq(name, "SourcePath"))
i->source_path = s;
-#ifndef LEGACY
+#ifndef NOLEGACY
else if (streq(name, "DefaultControlGroup")) {
const char *e;
e = startswith(s, SYSTEMD_CGROUP_CONTROLLER ":");