X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fust-ctl.h;h=131ff63b67e87305ce1c5466e592844e336fe6a7;hp=f4f34ee2f00bc32eecc3ad434c0f9737409e7a63;hb=92816cc33a1add3c8276839bd6335e17423577dd;hpb=10a8a2237343699e3923d87e24dbf2d7fe225377

diff --git a/src/bin/lttng-sessiond/ust-ctl.h b/src/bin/lttng-sessiond/ust-ctl.h
index f4f34ee2f..131ff63b6 100644
--- a/src/bin/lttng-sessiond/ust-ctl.h
+++ b/src/bin/lttng-sessiond/ust-ctl.h
@@ -3,11 +3,11 @@
  *
  * Meta header used to include all relevant file from the lttng ust ABI.
  *
- * Copyright (C) 2011 - David Goulet <david.goulet@polymtl.ca>
+ * 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 as published by the Free
- * Software Foundation; only version 2 of the License.
+ * under the terms of the GNU General Public License, version 2 only, as
+ * published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful, but WITHOUT
  * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -15,14 +15,14 @@
  * 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., 59 Temple
- * Place - Suite 330, Boston, MA  02111-1307, USA.
+ * this program; if not, write to the Free Software Foundation, Inc., 51
+ * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#ifndef _LTT_UST_CTL_H
-#define _LTT_UST_CTL_H
+#ifndef LTTNG_UST_CTL_H
+#define LTTNG_UST_CTL_H
 
-#include <config.h>
+struct ust_app;
 
 /*
  * FIXME: temporary workaround: we use a lttng-tools local version of
@@ -31,11 +31,25 @@
  * UST ABI.
  */
 #ifdef HAVE_LIBLTTNG_UST_CTL
+
 #include <lttng/ust-ctl.h>
 #include <lttng/ust-abi.h>
-#else
+#include <lttng/ust-error.h>
+
+int ust_app_release_object(struct ust_app *app, struct lttng_ust_object_data *data);
+
+#else /* HAVE_LIBLTTNG_UST_CTL */
+
 #include "lttng-ust-ctl.h"
 #include "lttng-ust-abi.h"
-#endif
+#include "lttng-ust-error.h"
+
+static inline
+int ust_app_release_object(struct ust_app *app, struct lttng_ust_object_data *data)
+{
+	return 0;
+}
+
+#endif /* HAVE_LIBLTTNG_UST_CTL */
 
 #endif /* _LTT_UST_CTL_H */