X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=liblttng-ust%2Flttng-ust-uuid.h;h=765e8d1346c2be0da103cc8e734c9704859cefa1;hb=refs%2Fheads%2Fstable-2.1;hp=1027acbee9f67579839e39c4e3e1ee5f0c6b393e;hpb=f194f3b00d042154c35f1f9ec262e25f2cd83b8a;p=lttng-ust.git

diff --git a/liblttng-ust/lttng-ust-uuid.h b/liblttng-ust/lttng-ust-uuid.h
index 1027acbe..765e8d13 100644
--- a/liblttng-ust/lttng-ust-uuid.h
+++ b/liblttng-ust/lttng-ust-uuid.h
@@ -4,14 +4,23 @@
 /*
  * Copyright (C) 2011   Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  *
- * THIS MATERIAL IS PROVIDED AS IS, WITH ABSOLUTELY NO WARRANTY EXPRESSED
- * OR IMPLIED.  ANY USE IS AT YOUR OWN RISK.
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
  *
- * Permission is hereby granted to use or copy this program
- * for any purpose,  provided the above notices are retained on all copies.
- * Permission to modify the code and to distribute modified code is granted,
- * provided the above notices are retained, and a notice that the code was
- * modified is included with the above copyright notice.
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
  */
 
 #include <config.h>
@@ -21,9 +30,9 @@
  */
 #define LTTNG_UST_UUID_STR_LEN		37
 
+#ifdef LTTNG_UST_HAVE_LIBUUID
 #include <uuid/uuid.h>
 
-#ifdef LTTNG_UST_HAVE_LIBUUID
 static inline
 int lttng_ust_uuid_generate(unsigned char *uuid_out)
 {
@@ -40,7 +49,7 @@ int lttng_ust_uuid_generate(unsigned char *uuid_out)
 {
 	uint32_t status;
 
-	uuid_create(uuid_out, &status);
+	uuid_create((uuid_t *) uuid_out, &status);
 	if (status == uuid_s_ok)
 		return 0;
 	else