From 44c72f10aa3cace72ffe40a0f9bb7aadb9c82dc8 Mon Sep 17 00:00:00 2001
From: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Date: Fri, 18 Nov 2011 14:04:08 -0500
Subject: [PATCH] Do not install usterr-signal-safe

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
---
 include/Makefile.am                      |  2 +-
 include/lttng/ringbuffer-config.h        |  1 -
 include/lttng/ust-tracepoint-event.h     |  2 +-
 include/{lttng => }/usterr-signal-safe.h |  0
 liblttng-ust-ctl/ustctl.c                |  3 ++-
 liblttng-ust/ltt-events.c                | 22 +++++++++++++---------
 liblttng-ust/ltt-tracer-core.h           |  7 +++----
 liblttng-ust/lttng-ust-abi.c             |  4 ++--
 liblttng-ust/lttng-ust-comm.c            |  6 +++---
 liblttng-ust/tracepoint.c                |  7 +++++--
 liblttng-ust/ust-core.c                  |  4 ++--
 libringbuffer/frontend_types.h           |  2 +-
 libringbuffer/shm.h                      |  2 +-
 snprintf/core.c                          |  2 +-
 14 files changed, 35 insertions(+), 29 deletions(-)
 rename include/{lttng => }/usterr-signal-safe.h (100%)

diff --git a/include/Makefile.am b/include/Makefile.am
index 28462e60..4ebff36a 100644
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -10,7 +10,6 @@ nobase_include_HEADERS = \
 	lttng/ust-abi.h \
 	lttng/ringbuffer-abi.h \
 	lttng/ust-tracer.h \
-	lttng/usterr-signal-safe.h \
 	lttng/config.h \
 	lttng/share.h \
 	lttng/ust.h \
@@ -22,6 +21,7 @@ nobase_include_HEADERS = \
 
 noinst_HEADERS = \
 	usterr.h \
+	usterr-signal-safe.h \
 	ust_snprintf.h \
 	ust-comm.h \
 	lttng/bitfield.h \
diff --git a/include/lttng/ringbuffer-config.h b/include/lttng/ringbuffer-config.h
index 1ff5858c..728738cd 100644
--- a/include/lttng/ringbuffer-config.h
+++ b/include/lttng/ringbuffer-config.h
@@ -21,7 +21,6 @@
 
 #include <errno.h>
 #include "lttng/ust-tracer.h"
-#include "lttng/usterr-signal-safe.h"
 #include <stdint.h>
 #include <stddef.h>
 #include <urcu/arch.h>
diff --git a/include/lttng/ust-tracepoint-event.h b/include/lttng/ust-tracepoint-event.h
index 23c2e384..6983ef16 100644
--- a/include/lttng/ust-tracepoint-event.h
+++ b/include/lttng/ust-tracepoint-event.h
@@ -14,8 +14,8 @@
 #include <stdio.h>
 #include <urcu/compiler.h>
 #include <lttng/ust-events.h>
-#include <lttng/usterr-signal-safe.h>
 #include <lttng/ringbuffer-config.h>
+#include <string.h>
 
 /*
  * Macro declarations used for all stages.
diff --git a/include/lttng/usterr-signal-safe.h b/include/usterr-signal-safe.h
similarity index 100%
rename from include/lttng/usterr-signal-safe.h
rename to include/usterr-signal-safe.h
diff --git a/liblttng-ust-ctl/ustctl.c b/liblttng-ust-ctl/ustctl.c
index 83c60034..e285a2d2 100644
--- a/liblttng-ust-ctl/ustctl.c
+++ b/liblttng-ust-ctl/ustctl.c
@@ -20,9 +20,10 @@
 #include <string.h>
 #include <lttng/ust-ctl.h>
 #include <lttng/ust-abi.h>
-#include <lttng/usterr-signal-safe.h>
 #include <lttng/ust-events.h>
 #include <sys/mman.h>
+
+#include <usterr-signal-safe.h>
 #include <ust-comm.h>
 
 #include "../libringbuffer/backend.h"
diff --git a/liblttng-ust/ltt-events.c b/liblttng-ust/ltt-events.c
index b67998c3..2595ea89 100644
--- a/liblttng-ust/ltt-events.c
+++ b/liblttng-ust/ltt-events.c
@@ -14,25 +14,29 @@
 #include <urcu/list.h>
 #include <urcu/hlist.h>
 #include <pthread.h>
-#include <urcu-bp.h>
-#include <urcu/compiler.h>
-#include <urcu/uatomic.h>
 #include <uuid/uuid.h>
-#include <lttng/tracepoint.h>
 #include <errno.h>
 #include <sys/shm.h>
 #include <sys/ipc.h>
+#include <stdint.h>
+#include <stddef.h>
+
+#include <urcu-bp.h>
+#include <urcu/compiler.h>
+#include <urcu/uatomic.h>
+#include <urcu/arch.h>
+
+#include <lttng/tracepoint.h>
 #include <lttng/ust-events.h>
-#include <lttng/usterr-signal-safe.h>
+
+#include <usterr-signal-safe.h>
+#include <helper.h>
+
 #include "ltt-tracer.h"
 #include "ltt-tracer-core.h"
 #include "wait.h"
 #include "../libringbuffer/shm.h"
-#include <stdint.h>
-#include <stddef.h>
-#include <urcu/arch.h>
 #include "jhash.h"
-#include <helper.h>
 
 /*
  * The sessions mutex is the centralized mutex across UST tracing
diff --git a/liblttng-ust/ltt-tracer-core.h b/liblttng-ust/ltt-tracer-core.h
index c54d620e..fdb73119 100644
--- a/liblttng-ust/ltt-tracer-core.h
+++ b/liblttng-ust/ltt-tracer-core.h
@@ -24,12 +24,11 @@
 #include <stdint.h>
 #include <stddef.h>
 #include <urcu/arch.h>
-#include <lttng/ust-tracer.h>
 #include <urcu/list.h>
-#include <lttng/usterr-signal-safe.h>
-#include "lttng/bug.h"
-
+#include <lttng/ust-tracer.h>
+#include <lttng/bug.h>
 #include <lttng/ringbuffer-config.h>
+#include <usterr-signal-safe.h>
 
 struct ltt_session;
 struct ltt_channel;
diff --git a/liblttng-ust/lttng-ust-abi.c b/liblttng-ust/lttng-ust-abi.c
index dbf53306..76af511f 100644
--- a/liblttng-ust/lttng-ust-abi.c
+++ b/liblttng-ust/lttng-ust-abi.c
@@ -28,11 +28,11 @@
 #include <urcu/compiler.h>
 #include <urcu/list.h>
 #include <lttng/ust-events.h>
-#include <lttng/usterr-signal-safe.h>
 #include <lttng/ust-version.h>
+#include <usterr-signal-safe.h>
+#include <helper.h>
 #include "ltt-tracer.h"
 #include "tracepoint-internal.h"
-#include <helper.h>
 
 struct ltt_tracepoint_list {
 	struct tracepoint_iter iter;
diff --git a/liblttng-ust/lttng-ust-comm.c b/liblttng-ust/lttng-ust-comm.c
index 17c7350d..2f972942 100644
--- a/liblttng-ust/lttng-ust-comm.c
+++ b/liblttng-ust/lttng-ust-comm.c
@@ -38,12 +38,12 @@
 #include <urcu/uatomic.h>
 #include <urcu/futex.h>
 
-#include <ust-comm.h>
 #include <lttng/ust-events.h>
-#include <lttng/usterr-signal-safe.h>
 #include <lttng/ust-abi.h>
-#include "tracepoint-internal.h"
 #include <lttng/ust.h>
+#include <ust-comm.h>
+#include <usterr-signal-safe.h>
+#include "tracepoint-internal.h"
 #include "ltt-tracer-core.h"
 
 /*
diff --git a/liblttng-ust/tracepoint.c b/liblttng-ust/tracepoint.c
index e62b11c7..abe39e57 100644
--- a/liblttng-ust/tracepoint.c
+++ b/liblttng-ust/tracepoint.c
@@ -21,17 +21,20 @@
 
 #define _LGPL_SOURCE
 #include <errno.h>
-#include <lttng/tracepoint.h>
 #include <stdint.h>
 #include <stddef.h>
+
 #include <urcu/arch.h>
 #include <urcu-bp.h>
 #include <urcu/hlist.h>
 #include <urcu/uatomic.h>
 #include <urcu/compiler.h>
+
+#include <lttng/tracepoint.h>
+
+#include <usterr-signal-safe.h>
 #include <helper.h>
 
-#include <lttng/usterr-signal-safe.h>
 #include "tracepoint-internal.h"
 #include "ltt-tracer-core.h"
 #include "jhash.h"
diff --git a/liblttng-ust/ust-core.c b/liblttng-ust/ust-core.c
index 80bd42b0..7c17a766 100644
--- a/liblttng-ust/ust-core.c
+++ b/liblttng-ust/ust-core.c
@@ -18,9 +18,9 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include <lttng/usterr-signal-safe.h>
-#include <lttng/ust-events.h>
 #include <stdlib.h>
+#include <lttng/ust-events.h>
+#include <usterr-signal-safe.h>
 
 static CDS_LIST_HEAD(ltt_transport_list);
 
diff --git a/libringbuffer/frontend_types.h b/libringbuffer/frontend_types.h
index cb3b21cd..32462f6b 100644
--- a/libringbuffer/frontend_types.h
+++ b/libringbuffer/frontend_types.h
@@ -21,8 +21,8 @@
 #include <urcu/list.h>
 #include <urcu/uatomic.h>
 
-#include <lttng/usterr-signal-safe.h>
 #include <lttng/ringbuffer-config.h>
+#include <usterr-signal-safe.h>
 #include "backend_types.h"
 #include "shm_internal.h"
 #include "vatomic.h"
diff --git a/libringbuffer/shm.h b/libringbuffer/shm.h
index d102b8bf..41111447 100644
--- a/libringbuffer/shm.h
+++ b/libringbuffer/shm.h
@@ -10,7 +10,7 @@
  */
 
 #include <stdint.h>
-#include <lttng/usterr-signal-safe.h>
+#include <usterr-signal-safe.h>
 #include <urcu/compiler.h>
 #include "shm_types.h"
 
diff --git a/snprintf/core.c b/snprintf/core.c
index cbacdb54..2fa9839c 100644
--- a/snprintf/core.c
+++ b/snprintf/core.c
@@ -18,6 +18,6 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include <lttng/usterr-signal-safe.h>
+#include <usterr-signal-safe.h>
 
 volatile enum ust_loglevel ust_loglevel;
-- 
2.34.1