From: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Date: Fri, 22 Apr 2011 17:19:18 +0000 (-0400)
Subject: Remove #define _LGPL_SOURCE from public headers
X-Git-Tag: v0.13~23
X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=b0c4126fca44c9fdc9b350ce0e896ec2818fbb3e;p=ust.git

Remove #define _LGPL_SOURCE from public headers

this header can be included by non-LGPL applications. Ensure that
use it.

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
---

diff --git a/include/ust/tracepoint.h b/include/ust/tracepoint.h
index a92f487..278a9c1 100644
--- a/include/ust/tracepoint.h
+++ b/include/ust/tracepoint.h
@@ -25,9 +25,9 @@
  * Ported to userspace by Pierre-Marc Fournier.
  */
 
-#define _LGPL_SOURCE
 #include <urcu-bp.h>
 #include <ust/core.h>
+#include <urcu/list.h>
 
 struct tracepoint;
 
diff --git a/libust/channels.h b/libust/channels.h
index e7bc59f..abe3c13 100644
--- a/libust/channels.h
+++ b/libust/channels.h
@@ -21,12 +21,11 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
+#define _LGPL_SOURCE
 #include <linux/limits.h>
 #include <errno.h>
 #include <ust/kcompat/kcompat.h>
 #include <ust/core.h>
-
-#define _LGPL_SOURCE
 #include <urcu/list.h>
 #include <urcu/urcu_ref.h>
 
diff --git a/libust/marker.c b/libust/marker.c
index d475d82..43f0328 100644
--- a/libust/marker.c
+++ b/libust/marker.c
@@ -16,9 +16,9 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
+#define _LGPL_SOURCE
 #include <stdlib.h>
 #include <errno.h>
-#define _LGPL_SOURCE
 #include <urcu-bp.h>
 #include <urcu/rculist.h>
 #include <urcu/hlist.h>
diff --git a/libust/serialize.c b/libust/serialize.c
index 31174d8..c3b7fc3 100644
--- a/libust/serialize.c
+++ b/libust/serialize.c
@@ -25,6 +25,7 @@
  */
 
 #define _GNU_SOURCE
+#define _LGPL_SOURCE
 #include <unistd.h>
 #include <sys/syscall.h>
 #include <stdarg.h>
@@ -32,7 +33,6 @@
 #include <stdint.h>
 #include <stdio.h>
 
-#define _LGPL_SOURCE
 #include <urcu-bp.h>
 #include <urcu/rculist.h>
 
diff --git a/libust/trace_event.c b/libust/trace_event.c
index f96adf6..a605901 100644
--- a/libust/trace_event.c
+++ b/libust/trace_event.c
@@ -17,15 +17,15 @@
  *
  */
 
+#define _LGPL_SOURCE
 #include <errno.h>
 #include <ust/tracepoint.h>
 #include <ust/core.h>
 #include <ust/kcompat/kcompat.h>
-#include "usterr_signal_safe.h"
-
-#define _LGPL_SOURCE
 #include <urcu-bp.h>
 
+#include "usterr_signal_safe.h"
+
 /* libraries that contain trace_events (struct trace_event_lib) */
 static CDS_LIST_HEAD(libs);
 
diff --git a/libust/tracectl.c b/libust/tracectl.c
index 9634f22..1487ac7 100644
--- a/libust/tracectl.c
+++ b/libust/tracectl.c
@@ -21,6 +21,7 @@
  */
 
 #define _GNU_SOURCE
+#define _LGPL_SOURCE
 #include <stdio.h>
 #include <stdlib.h>
 #include <stdint.h>
diff --git a/libust/tracepoint.c b/libust/tracepoint.c
index da7f358..737e5f5 100644
--- a/libust/tracepoint.c
+++ b/libust/tracepoint.c
@@ -19,16 +19,16 @@
  * Ported to userspace by Pierre-Marc Fournier.
  */
 
+#define _LGPL_SOURCE
 #include <errno.h>
 #include <ust/tracepoint.h>
 #include <ust/core.h>
 #include <ust/kcompat/kcompat.h>
-#include "usterr_signal_safe.h"
-
-#define _LGPL_SOURCE
 #include <urcu-bp.h>
 #include <urcu/hlist.h>
 
+#include "usterr_signal_safe.h"
+
 //extern struct tracepoint __start___tracepoints[] __attribute__((visibility("hidden")));
 //extern struct tracepoint __stop___tracepoints[] __attribute__((visibility("hidden")));