Rename utmp.c/utmp.h to lxcutmp.c/lxcutmp.h

This avoids conflict with the system header utmp.h.

Signed-off-by: Stéphane Graber <stgraber@ubuntu.com>
Acked-by: Serge E. Hallyn <serge.hallyn@ubuntu.com>

diff --git a/src/lxc/Makefile.am b/src/lxc/Makefile.am
index 693167aaa435eb2f9c83cdd5e742ff8d30d7cb73..5a28af4c999ec7ad63185deb55dc5d5cfd63dc80 100644 (file)
--- a/src/lxc/Makefile.am
+++ b/src/lxc/Makefile.am
@@ -68,7 +68,7 @@ liblxc_so_SOURCES = \
        mainloop.c mainloop.h \
        af_unix.c af_unix.h \
        \
-       utmp.c utmp.h \
+       lxcutmp.c lxcutmp.h \
        apparmor.c apparmor.h \
        lxclock.h lxclock.c \
        lxccontainer.c lxccontainer.h

diff --git a/src/lxc/utmp.c b/src/lxc/lxcutmp.c
similarity index 100%
rename from src/lxc/utmp.c
rename to src/lxc/lxcutmp.c

diff --git a/src/lxc/utmp.h b/src/lxc/lxcutmp.h
similarity index 100%
rename from src/lxc/utmp.h
rename to src/lxc/lxcutmp.h

diff --git a/src/lxc/start.c b/src/lxc/start.c
index 427cc709d4a96bbf655b208aeffea4d32fd78dce..a539703d5748ab125b3c38c0f6248a787cf8d381 100644 (file)
--- a/src/lxc/start.c
+++ b/src/lxc/start.c
@@ -125,7 +125,7 @@ int signalfd(int fd, const sigset_t *mask, int flags)
 #include "af_unix.h"
 #include "mainloop.h"
 #include "utils.h"
-#include "utmp.h"
+#include "lxcutmp.h"
 #include "monitor.h"
 #include "commands.h"
 #include "console.h"