From: Stéphane Graber <stgraber@ubuntu.com>
Date: Fri, 11 Jan 2013 17:29:54 +0000 (-0500)
Subject: Rename utmp.c/utmp.h to lxcutmp.c/lxcutmp.h
X-Git-Tag: lxc-0.9.0.alpha3~1^2~39
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=565c2d76a30d29ecce76ca595cf79dd1e528399e;p=thirdparty%2Flxc.git

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 693167aaa..5a28af4c9 100644
--- 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 427cc709d..a539703d5 100644
--- 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"