From 7a6224c44a69db2ba6449af8ec54db011797b8f7 Mon Sep 17 00:00:00 2001 From: Philippe Proulx Date: Thu, 11 May 2017 13:23:19 -0400 Subject: [PATCH] Move library's version API to include/babeltrace/version.h MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Let's keep include/babeltrace/babeltrace.h a master header only. Signed-off-by: Philippe Proulx Signed-off-by: Jérémie Galarneau --- include/Makefile.am | 3 ++- include/babeltrace/babeltrace.h | 5 ----- include/babeltrace/version.h | 31 +++++++++++++++++++++++++++++++ 3 files changed, 33 insertions(+), 6 deletions(-) create mode 100644 include/babeltrace/version.h diff --git a/include/Makefile.am b/include/Makefile.am index 1238144a..124dce7e 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -3,7 +3,8 @@ babeltraceinclude_HEADERS = \ babeltrace/babeltrace.h \ babeltrace/values.h \ babeltrace/ref.h \ - babeltrace/logging.h + babeltrace/logging.h \ + babeltrace/version.h # Legacy API (for CTF writer) babeltracectfinclude_HEADERS = \ diff --git a/include/babeltrace/babeltrace.h b/include/babeltrace/babeltrace.h index f6ba1bcb..8a52e68a 100644 --- a/include/babeltrace/babeltrace.h +++ b/include/babeltrace/babeltrace.h @@ -25,9 +25,4 @@ * SOFTWARE. */ -extern int bt_version_get_major(void); -extern int bt_version_get_minor(void); -extern int bt_version_get_patch(void); -extern const char *bt_version_get_extra(void); - #endif /* BABELTRACE_BABELTRACE_H */ diff --git a/include/babeltrace/version.h b/include/babeltrace/version.h new file mode 100644 index 00000000..20854d53 --- /dev/null +++ b/include/babeltrace/version.h @@ -0,0 +1,31 @@ +#ifndef BABELTRACE_VERSION_H +#define BABELTRACE_VERSION_H + +/* + * Copyright 2017 - Philippe Proulx + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ + +extern int bt_version_get_major(void); +extern int bt_version_get_minor(void); +extern int bt_version_get_patch(void); +extern const char *bt_version_get_extra(void); + +#endif /* BABELTRACE_VERSION_H */ -- 2.34.1