From 64a23ac4e22093a782b87fe615fabf20edacedd2 Mon Sep 17 00:00:00 2001 From: David Goulet Date: Fri, 27 May 2011 15:56:40 -0400 Subject: [PATCH] Fix errors due to lttng.h cleanup Rename lttng/lttng.h to options.h in order to avoid confusion with the public lttng.h header file. Signed-off-by: David Goulet --- liblttngctl/liblttngctl.c | 2 +- ltt-sessiond/main.c | 2 +- lttng/lttng.c | 2 +- lttng/options.c | 2 +- lttng/{lttng.h => options.h} | 6 +++--- 5 files changed, 7 insertions(+), 7 deletions(-) rename lttng/{lttng.h => options.h} (95%) diff --git a/liblttngctl/liblttngctl.c b/liblttngctl/liblttngctl.c index ab44efe90..c27ce0928 100644 --- a/liblttngctl/liblttngctl.c +++ b/liblttngctl/liblttngctl.c @@ -588,5 +588,5 @@ end: static void __attribute__((constructor)) init() { /* Set default session group */ - lttng_set_tracing_group(DEFAULT_TRACING_GROUP); + lttng_set_tracing_group(LTTNG_DEFAULT_TRACING_GROUP); } diff --git a/ltt-sessiond/main.c b/ltt-sessiond/main.c index 722402311..4b2fb52c2 100644 --- a/ltt-sessiond/main.c +++ b/ltt-sessiond/main.c @@ -55,7 +55,7 @@ /* Const values */ const char default_home_dir[] = DEFAULT_HOME_DIR; -const char default_tracing_group[] = DEFAULT_TRACING_GROUP; +const char default_tracing_group[] = LTTNG_DEFAULT_TRACING_GROUP; const char default_ust_sock_dir[] = DEFAULT_UST_SOCK_DIR; const char default_global_apps_pipe[] = DEFAULT_GLOBAL_APPS_PIPE; diff --git a/lttng/lttng.c b/lttng/lttng.c index 5319c13d3..ab8995274 100644 --- a/lttng/lttng.c +++ b/lttng/lttng.c @@ -32,8 +32,8 @@ #include -#include "lttng.h" #include "lttngerr.h" +#include "options.h" /* Variables */ static char *progname; diff --git a/lttng/options.c b/lttng/options.c index bb3ecbb0c..643ea5194 100644 --- a/lttng/options.c +++ b/lttng/options.c @@ -19,7 +19,7 @@ #include #include -#include "lttng.h" +#include "options.h" /* Option variables */ char *opt_event_list; diff --git a/lttng/lttng.h b/lttng/options.h similarity index 95% rename from lttng/lttng.h rename to lttng/options.h index efaed09b5..d5c0b5372 100644 --- a/lttng/lttng.h +++ b/lttng/options.h @@ -15,8 +15,8 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#ifndef _LTTNG_H -#define _LTTNG_H +#ifndef _LTTNG_OPTIONS_H +#define _LTTNG_OPTIONS_H_ /* Function prototypes */ int parse_args(int argc, const char **argv); @@ -47,4 +47,4 @@ extern int opt_start_trace; extern int opt_stop_trace; extern pid_t opt_trace_pid; -#endif /* _LTTNG_H */ +#endif /* _LTTNG_OPTIONS_H */ -- 2.34.1