X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=include%2Flttng%2Falign.h;h=f2163e08d56c74918e026347ef43e3054c3c05cb;hb=5a821cd6258af4b44aac352bd89b715377cee7d2;hp=0a5363ea3e7161897465b469c52617f32dd2adc7;hpb=993e8a491eba696a20f91c3688b90f2b155a8c9c;p=lttng-ust.git

diff --git a/include/lttng/align.h b/include/lttng/align.h
index 0a5363ea..f2163e08 100644
--- a/include/lttng/align.h
+++ b/include/lttng/align.h
@@ -6,20 +6,25 @@
  *
  * (C) Copyright 2010-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.
  */
 
 #include <lttng/bug.h>
 #include <unistd.h>
+#include <limits.h>
 
+#ifndef PAGE_SIZE	/* Cygwin limits.h defines its own PAGE_SIZE */
 #define PAGE_SIZE		sysconf(_SC_PAGE_SIZE)
+#endif
+
 #define PAGE_MASK		(~(PAGE_SIZE - 1))
 #define __ALIGN_MASK(v, mask)	(((v) + (mask)) & ~(mask))
 #define ALIGN(v, align)		__ALIGN_MASK(v, (typeof(v)) (align) - 1)
@@ -36,7 +41,7 @@
  */
 #define offset_align(align_drift, alignment)				       \
 	({								       \
-		BUILD_RUNTIME_BUG_ON((alignment) == 0			       \
+		LTTNG_BUILD_RUNTIME_BUG_ON((alignment) == 0		       \
 				   || ((alignment) & ((alignment) - 1)));      \
 		(((alignment) - (align_drift)) & ((alignment) - 1));	       \
 	})
@@ -51,7 +56,7 @@
  */
 #define offset_align_floor(align_drift, alignment)			       \
 	({								       \
-		BUILD_RUNTIME_BUG_ON((alignment) == 0			       \
+		LTTNG_BUILD_RUNTIME_BUG_ON((alignment) == 0		       \
 				   || ((alignment) & ((alignment) - 1)));      \
 		(((align_drift) - (alignment)) & ((alignment) - 1);	       \
 	})