API: export lxc_get_version()

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 aba2e675402c3344f2e8f20546333e593de7828d..0385e0d196042b7efceaf0a3107f24015f90e653 100644 (file)
--- a/src/lxc/Makefile.am
+++ b/src/lxc/Makefile.am
@@ -15,7 +15,8 @@ pkginclude_HEADERS = \
                state.h \
                attach.h \
                lxccontainer.h \
-               lxclock.h
+               lxclock.h \
+               version.h
 
 if IS_BIONIC
 pkginclude_HEADERS += \
@@ -71,7 +72,8 @@ liblxc_so_SOURCES = \
        lxcutmp.c lxcutmp.h \
        apparmor.c apparmor.h \
        lxclock.h lxclock.c \
-       lxccontainer.c lxccontainer.h
+       lxccontainer.c lxccontainer.h \
+       version.c version.h
 
 if IS_BIONIC
 liblxc_so_SOURCES += \

diff --git a/src/lxc/lxc.h b/src/lxc/lxc.h
index 784b3cadd6b3ce14e30ef734bda39a0fa25d8555..a49a0a5ed13cbf49f46bf871b39555b1cd1079a3 100644 (file)
--- a/src/lxc/lxc.h
+++ b/src/lxc/lxc.h
@@ -196,11 +196,6 @@ extern int lxc_checkpoint(const char *name, int sfd, int flags);
  */
 extern int lxc_restart(const char *, int, struct lxc_conf *, int, const char *);
 
-/*
- * Returns the version number of the library
- */
-extern const char const *lxc_version(void);
-
 /*
  * Create and return a new lxccontainer struct.
  */

diff --git a/src/lxc/lxccontainer.c b/src/lxc/lxccontainer.c
index 656907198dc643fca837bbd3264f01516d778c2b..480c4f5f3f7c90b20624a6338caff6248e118e05 100644 (file)
--- a/src/lxc/lxccontainer.c
+++ b/src/lxc/lxccontainer.c
@@ -25,6 +25,7 @@
 #include "confile.h"
 #include "cgroup.h"
 #include "commands.h"
+#include "version.h"
 #include "log.h"
 #include <unistd.h>
 #include <sys/types.h>
@@ -978,6 +979,11 @@ const char *lxc_get_default_config_path(void)
        return default_lxc_path();
 }
 
+const char *lxc_get_version(void)
+{
+       return lxc_version();
+}
+
 struct lxc_container *lxc_container_new(const char *name, const char *configpath)
 {
        struct lxc_container *c;

diff --git a/src/lxc/lxccontainer.h b/src/lxc/lxccontainer.h
index f0c45651bde200848f4108c8d5b7a99f5d331c0f..de9854c905802bd87b4cacbccb20ae89b3e43871 100644 (file)
--- a/src/lxc/lxccontainer.h
+++ b/src/lxc/lxccontainer.h
@@ -87,6 +87,7 @@ int lxc_container_get(struct lxc_container *c);
 int lxc_container_put(struct lxc_container *c);
 int lxc_get_wait_states(const char **states);
 const char *lxc_get_default_config_path(void);
+const char *lxc_get_version(void);
 
 #if 0
 char ** lxc_get_valid_keys();

diff --git a/src/lxc/version.h b/src/lxc/version.h
new file mode 100644 (file)
index 0000000..2175d73
--- /dev/null
+++ b/src/lxc/version.h
@@ -0,0 +1,31 @@
+/*
+ * lxc: linux Container library
+ *
+ * (C) Copyright IBM Corp. 2007, 2008
+ *
+ * Authors:
+ * Daniel Lezcano <dlezcano at fr.ibm.com>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+#ifndef _version_h
+#define _version_h
+
+/*
+ * Returns the version number of the library
+ */
+extern const char const *lxc_version(void);
+
+#endif