From 0dbc2034c9571ec342d382bf87231775563f8624 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Genevi=C3=A8ve=20Bastien?= <gbastien+lttng@versatic.net>
Date: Thu, 1 Mar 2018 17:11:41 -0500
Subject: [PATCH] sessiond: rename syscall.h so it does not conflict with
 system
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Signed-off-by: Geneviève Bastien <gbastien+lttng@versatic.net>
Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>
---
 src/bin/lttng-sessiond/Makefile.am                    | 2 +-
 src/bin/lttng-sessiond/cmd.c                          | 2 +-
 src/bin/lttng-sessiond/{syscall.c => lttng-syscall.c} | 2 +-
 src/bin/lttng-sessiond/{syscall.h => lttng-syscall.h} | 6 +++---
 src/bin/lttng-sessiond/main.c                         | 2 +-
 src/bin/lttng-sessiond/save.c                         | 2 +-
 6 files changed, 8 insertions(+), 8 deletions(-)
 rename src/bin/lttng-sessiond/{syscall.c => lttng-syscall.c} (99%)
 rename src/bin/lttng-sessiond/{syscall.h => lttng-syscall.h} (95%)

diff --git a/src/bin/lttng-sessiond/Makefile.am b/src/bin/lttng-sessiond/Makefile.am
index f256aadb2..156b6d822 100644
--- a/src/bin/lttng-sessiond/Makefile.am
+++ b/src/bin/lttng-sessiond/Makefile.am
@@ -31,7 +31,7 @@ lttng_sessiond_SOURCES = utils.c utils.h \
                        agent.c agent.h \
                        save.h save.c \
                        load-session-thread.h load-session-thread.c \
-                       syscall.h syscall.c \
+                       lttng-syscall.h lttng-syscall.c \
                        notification-thread.h notification-thread.c \
                        notification-thread-internal.h \
                        notification-thread-commands.h notification-thread-commands.c \
diff --git a/src/bin/lttng-sessiond/cmd.c b/src/bin/lttng-sessiond/cmd.c
index 4c5160764..a1eb961ee 100644
--- a/src/bin/lttng-sessiond/cmd.c
+++ b/src/bin/lttng-sessiond/cmd.c
@@ -47,7 +47,7 @@
 #include "kernel-consumer.h"
 #include "lttng-sessiond.h"
 #include "utils.h"
-#include "syscall.h"
+#include "lttng-syscall.h"
 #include "agent.h"
 #include "buffer-registry.h"
 #include "notification-thread.h"
diff --git a/src/bin/lttng-sessiond/syscall.c b/src/bin/lttng-sessiond/lttng-syscall.c
similarity index 99%
rename from src/bin/lttng-sessiond/syscall.c
rename to src/bin/lttng-sessiond/lttng-syscall.c
index 7d0a92b6b..9a45a8af7 100644
--- a/src/bin/lttng-sessiond/syscall.c
+++ b/src/bin/lttng-sessiond/lttng-syscall.c
@@ -24,7 +24,7 @@
 
 #include "lttng-sessiond.h"
 #include "kernel.h"
-#include "syscall.h"
+#include "lttng-syscall.h"
 #include "utils.h"
 
 /* Global syscall table. */
diff --git a/src/bin/lttng-sessiond/syscall.h b/src/bin/lttng-sessiond/lttng-syscall.h
similarity index 95%
rename from src/bin/lttng-sessiond/syscall.h
rename to src/bin/lttng-sessiond/lttng-syscall.h
index 5f065cdbe..a2708619c 100644
--- a/src/bin/lttng-sessiond/syscall.h
+++ b/src/bin/lttng-sessiond/lttng-syscall.h
@@ -15,8 +15,8 @@
  * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#ifndef SYSCALL_H
-#define SYSCALL_H
+#ifndef LTTNG_SYSCALL_H
+#define LTTNG_SYSCALL_H
 
 #include <common/hashtable/hashtable.h>
 #include <lttng/event.h>
@@ -54,4 +54,4 @@ extern struct syscall *syscall_table;
 int syscall_init_table(void);
 ssize_t syscall_table_list(struct lttng_event **events);
 
-#endif /* SYSCALL_H */
+#endif /* LTTNG_SYSCALL_H */
diff --git a/src/bin/lttng-sessiond/main.c b/src/bin/lttng-sessiond/main.c
index 4968ee2a9..8e8b83b0f 100644
--- a/src/bin/lttng-sessiond/main.c
+++ b/src/bin/lttng-sessiond/main.c
@@ -74,7 +74,7 @@
 #include "notification-thread.h"
 #include "notification-thread-commands.h"
 #include "rotation-thread.h"
-#include "syscall.h"
+#include "lttng-syscall.h"
 #include "agent.h"
 #include "ht-cleanup.h"
 #include "sessiond-config.h"
diff --git a/src/bin/lttng-sessiond/save.c b/src/bin/lttng-sessiond/save.c
index ea4feb0c3..b7d0cc80a 100644
--- a/src/bin/lttng-sessiond/save.c
+++ b/src/bin/lttng-sessiond/save.c
@@ -32,7 +32,7 @@
 #include "kernel.h"
 #include "save.h"
 #include "session.h"
-#include "syscall.h"
+#include "lttng-syscall.h"
 #include "trace-ust.h"
 #include "agent.h"
 
-- 
2.34.1