projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Port: Remove _GNU_SOURCE, defined in config.h
[lttng-tools.git]
/
src
/
bin
/
lttng
/
commands
/
version.c
diff --git
a/src/bin/lttng/commands/version.c
b/src/bin/lttng/commands/version.c
index 8631cf9482cce8f853fa4dd8530a6c1f9bf600da..7634f5871a0eaec92e7a4820e36e21c487905aa1 100644
(file)
--- a/
src/bin/lttng/commands/version.c
+++ b/
src/bin/lttng/commands/version.c
@@
-15,7
+15,7
@@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-#define _
GNU
_SOURCE
+#define _
LGPL
_SOURCE
#include <popt.h>
#include <stdio.h>
#include <stdlib.h>
#include <popt.h>
#include <stdio.h>
#include <stdlib.h>
@@
-23,7
+23,6
@@
#include <sys/stat.h>
#include <sys/types.h>
#include <unistd.h>
#include <sys/stat.h>
#include <sys/types.h>
#include <unistd.h>
-#include <config.h>
#include <common/mi-lttng.h>
#include <common/mi-lttng.h>
@@
-65,7
+64,7
@@
static void create_version(struct mi_lttng_version *version)
version->version_major = VERSION_MAJOR;
version->version_minor = VERSION_MINOR;
version->version_patchlevel = VERSION_PATCHLEVEL;
version->version_major = VERSION_MAJOR;
version->version_minor = VERSION_MINOR;
version->version_patchlevel = VERSION_PATCHLEVEL;
- strncpy(version->version_commit,
FULL
_VERSION, NAME_MAX);
+ strncpy(version->version_commit,
GIT
_VERSION, NAME_MAX);
strncpy(version->version_name, VERSION_NAME, NAME_MAX);
strncpy(version->package_url, PACKAGE_URL, NAME_MAX);
}
strncpy(version->version_name, VERSION_NAME, NAME_MAX);
strncpy(version->package_url, PACKAGE_URL, NAME_MAX);
}
@@
-164,7
+163,8
@@
int cmd_version(int argc, const char **argv)
if (lttng_opt_mi) {
ret = print_mi();
} else {
if (lttng_opt_mi) {
ret = print_mi();
} else {
- MSG("lttng version " FULL_VERSION " - " VERSION_NAME);
+ MSG("lttng version " VERSION " - " VERSION_NAME "%s",
+ GIT_VERSION[0] == '\0' ? "" : " - " GIT_VERSION);
MSG("\n" VERSION_DESCRIPTION "\n");
MSG("Web site: http://lttng.org");
MSG("\n%s", lttng_license);
MSG("\n" VERSION_DESCRIPTION "\n");
MSG("Web site: http://lttng.org");
MSG("\n%s", lttng_license);
This page took
0.024932 seconds
and
4
git commands to generate.