X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=tests%2Fregression%2Fust%2Fmulti-lib%2Fmulti-lib-test.c;fp=tests%2Fregression%2Fust%2Fmulti-lib%2Fmulti-lib-test.c;h=6ebb13d7a4c9eaa6fefa304d784af1e000dc14dc;hp=6a91089df27dc0c1281060d0e11a897354237efd;hb=1831ae68b70dece8e9b847081526495adbbf05e5;hpb=25357057de5ae4dd2a572e8f9b893c1b90cbd60a

diff --git a/tests/regression/ust/multi-lib/multi-lib-test.c b/tests/regression/ust/multi-lib/multi-lib-test.c
index 6a91089df..6ebb13d7a 100644
--- a/tests/regression/ust/multi-lib/multi-lib-test.c
+++ b/tests/regression/ust/multi-lib/multi-lib-test.c
@@ -15,6 +15,7 @@
 #include "callsites.h"
 #endif
 
+void exec_callsite();
 void exec_callsite()
 {
 #if HAS_CALLSITES
@@ -22,7 +23,7 @@ void exec_callsite()
 #endif
 }
 
-void print_list(void)
+static void print_list(void)
 {
 	fprintf(stderr, "Test list (-t X):\n");
 	fprintf(stderr, "\t0: dlopen() all libraries pass in arguments and execute "
@@ -31,7 +32,8 @@ void print_list(void)
 	fprintf(stderr, "\t2: simulate the upgrade of a library containing the callsites using dlopen() and dlclose(). \n");
 }
 
-int dl_open_all(int nb_libraries, char **libraries)
+#if HAS_CALLSITES
+static int dl_open_all(int nb_libraries, char **libraries)
 {
 	int i, ret = 0;
 	void **handles;
@@ -56,12 +58,14 @@ error:
 	free(handles);
 	return ret;
 }
+#endif
 
+#if HAS_CALLSITES
 /*
  * Takes 2 paths to libraries, dlopen() the first, trace, dlopen() the second,
  * and dlclose the first to simulate the upgrade of a library.
  */
-int upgrade_lib(int nb_libraries, char **libraries)
+static int upgrade_lib(int nb_libraries, char **libraries)
 {
 	int i, ret = 0;
 	void *handles[2];
@@ -92,12 +96,14 @@ int upgrade_lib(int nb_libraries, char **libraries)
 error:
 	return ret;
 }
+#endif
 
+#if !HAS_CALLSITES
 /*
  * Simulate the upgrade of a library containing a callsite.
  * Receives two libraries containing callsites for the same tracepoint.
  */
-int upgrade_callsite(int nb_libraries, char **libraries)
+static int upgrade_callsite(int nb_libraries, char **libraries)
 {
 	int ret = 0;
 	void *handles[2];
@@ -159,6 +165,7 @@ int upgrade_callsite(int nb_libraries, char **libraries)
 error:
 	return ret;
 }
+#endif
 
 int main(int argc, const char **argv)
 {