Adapt to lttng-ust ust-abi.h naming prefix update

[lttng-tools.git] / src / bin / lttng-sessiond / buffer-registry.h

diff --git a/src/bin/lttng-sessiond/buffer-registry.h b/src/bin/lttng-sessiond/buffer-registry.h
index d0d1575fd47e478ea57b6ae91aca6af6effd3189..440493d475f92c4472c746a8a31950c3792c8ebd 100644 (file)
--- a/src/bin/lttng-sessiond/buffer-registry.h
+++ b/src/bin/lttng-sessiond/buffer-registry.h
@@ -1,18 +1,8 @@
 /*
- * Copyright (C) 2013 - David Goulet <dgoulet@efficios.com>
+ * Copyright (C) 2013 David Goulet <dgoulet@efficios.com>
  *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License, version 2 only, as
- * published by the Free Software Foundation.
+ * SPDX-License-Identifier: GPL-2.0-only
  *
- * This program 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 General Public License for
- * more details.
- *
- * You should have received a copy of the GNU General Public License along with
- * this program; if not, write to the Free Software Foundation, Inc., 51
- * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
 #ifndef LTTNG_BUFFER_REGISTRY_H
@@ -25,14 +15,14 @@
 #include <common/hashtable/hashtable.h>
 
 #include "consumer.h"
-#include "ust-ctl.h"
+#include "lttng-ust-ctl.h"
 #include "ust-registry.h"
 
 struct buffer_reg_stream {
        struct cds_list_head lnode;
        union {
                /* Original object data that MUST be copied over. */
-               struct lttng_ust_object_data *ust;
+               struct lttng_ust_abi_object_data *ust;
        } obj;
 };
 
@@ -55,7 +45,7 @@ struct buffer_reg_channel {
        size_t num_subbuf;
        union {
                /* Original object data that MUST be copied over. */
-               struct lttng_ust_object_data *ust;
+               struct lttng_ust_abi_object_data *ust;
        } obj;
 };