summaryrefslogtreecommitdiff
path: root/shlibs
diff options
context:
space:
mode:
authorKarel Zak <kzak@redhat.com>2009-10-27 11:30:37 +0100
committerKarel Zak <kzak@redhat.com>2009-10-27 11:30:37 +0100
commit033cf439e382afba06b06552cba67dd42405c660 (patch)
treeb375042db931c31fbeb9dbdc2ddd7c9a23b309aa /shlibs
parent048c62915fd76c3ed47afe2dde2a9b297fad9a81 (diff)
downloadutil-linux-old-033cf439e382afba06b06552cba67dd42405c660.tar.gz
libblkid: add BLKID_{VERSION,DATE} to blkid.h
The original e2fsprogs has BLKID_{VERSION,DATE} macros in blkid.h. Although the macros are not updated for many years in e2fsprogs. So I guess nobody uses it. Signed-off-by: Karel Zak <kzak@redhat.com>
Diffstat (limited to 'shlibs')
-rw-r--r--shlibs/blkid/.gitignore1
-rw-r--r--shlibs/blkid/src/Makefile.am2
-rw-r--r--shlibs/blkid/src/blkid.h.in (renamed from shlibs/blkid/src/blkid.h)3
-rw-r--r--shlibs/blkid/src/version.c6
4 files changed, 11 insertions, 1 deletions
diff --git a/shlibs/blkid/.gitignore b/shlibs/blkid/.gitignore
index d6126dea..6ffe4a9e 100644
--- a/shlibs/blkid/.gitignore
+++ b/shlibs/blkid/.gitignore
@@ -2,3 +2,4 @@
bin/blkid
bin/findfs
test_*
+blkid.h
diff --git a/shlibs/blkid/src/Makefile.am b/shlibs/blkid/src/Makefile.am
index 1a6aa022..49470008 100644
--- a/shlibs/blkid/src/Makefile.am
+++ b/shlibs/blkid/src/Makefile.am
@@ -46,7 +46,7 @@ libblkid_la_LDFLAGS = -Wl,--version-script=$(ul_libblkid_srcdir)/blkid.sym \
tests = test_cache test_config test_dev test_devname test_devno test_getsize \
test_read test_resolve test_save test_tag test_verify test_evaluate
-EXTRA_DIST = blkid.sym tst_types.c
+EXTRA_DIST = blkid.sym tst_types.c blkid.h.in
CLEANFILES = $(tests)
tests: all $(tests)
diff --git a/shlibs/blkid/src/blkid.h b/shlibs/blkid/src/blkid.h.in
index 6b495b69..9c0a1d57 100644
--- a/shlibs/blkid/src/blkid.h
+++ b/shlibs/blkid/src/blkid.h.in
@@ -30,6 +30,9 @@
extern "C" {
#endif
+#define BLKID_VERSION "@LIBBLKID_VERSION@"
+#define BLKID_DATE "@LIBBLKID_DATE@"
+
/**
* blkid_dev:
*
diff --git a/shlibs/blkid/src/version.c b/shlibs/blkid/src/version.c
index 91fd5117..4c7fa06c 100644
--- a/shlibs/blkid/src/version.c
+++ b/shlibs/blkid/src/version.c
@@ -22,6 +22,12 @@
static const char *lib_version = LIBBLKID_VERSION; /* release version */
static const char *lib_date = LIBBLKID_DATE;
+/**
+ * blkid_parse_version_string:
+ * @ver_string: version string (e.g. "2.16.0")
+ *
+ * Returns: release version code.
+ */
int blkid_parse_version_string(const char *ver_string)
{
const char *cp;