X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=libust%2Fmarker.h;h=5fe50a9f4d2e32891c154a8e9b57c153a63b504e;hb=3a54945e83cfa6d87fa2e2d849e715127d76476a;hp=25c27f62ca774020ae43c7c7e2e86e52810af8d2;hpb=9160b4e4541d3a6010e4e671ee5deb3ea89f4211;p=lttng-ust.git

diff --git a/libust/marker.h b/libust/marker.h
index 25c27f62..5fe50a9f 100644
--- a/libust/marker.h
+++ b/libust/marker.h
@@ -6,8 +6,19 @@
  * (C) Copyright 2006 Mathieu Desnoyers <mathieu.desnoyers@polymtl.ca>
  * (C) Copyright 2009 Pierre-Marc Fournier <pierre-marc dot fournier at polymtl dot ca>
  *
- * This file is released under the GPLv2.
- * See the file COPYING for more details.
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
 #ifndef _LINUX_MARKER_H
@@ -18,8 +29,8 @@
 #include "immediate.h"
 //ust// #include <linux/ltt-channels.h>
 #include "kernelcompat.h"
-#include "compiler.h"
 #include <kcompat/list.h>
+#include "localerr.h"
 
 //ust// struct module;
 //ust// struct task_struct;
@@ -292,11 +303,11 @@ extern struct marker __stop___markers[] __attribute__((visibility("hidden")));
 											\
 static void __attribute__((constructor)) __markers__init(void) 				\
 {											\
+	DBG("next registration in "__FILE__"\n");\
 	marker_register_lib(__start___markers, (((long)__stop___markers)-((long)__start___markers))/sizeof(struct marker));\
 }
 
-void marker_set_new_marker_cb(void (*cb)(struct marker *));
-
-void init_markers(void);
+extern void marker_set_new_marker_cb(void (*cb)(struct marker *));
+extern void init_markers(void);
 
 #endif