X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=include%2Fbabeltrace%2Falign.h;h=fc991020cca26268c7d6e7b4d29b101ffe60b902;hb=refs%2Fheads%2Fstable-1.1;hp=00bd4cb3b6d84dca0ec61666d4834756bcf43301;hpb=ccd7e1c86f36342b0b06651cc52df86bb663c271;p=babeltrace.git

diff --git a/include/babeltrace/align.h b/include/babeltrace/align.h
index 00bd4cb3..fc991020 100644
--- a/include/babeltrace/align.h
+++ b/include/babeltrace/align.h
@@ -15,9 +15,23 @@
  *
  * 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 <ctf/compiler.h>
+#include <babeltrace/compiler.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 ALIGN(x, a)		__ALIGN_MASK(x, (typeof(x))(a) - 1)
 #define __ALIGN_MASK(x, mask)	(((x) + (mask)) & ~(mask))
@@ -62,7 +76,7 @@
 	({								       \
 		MAYBE_BUILD_BUG_ON((alignment) == 0			       \
 				   || ((alignment) & ((alignment) - 1)));      \
-		(((align_drift) - (alignment)) & ((alignment) - 1);	       \
+		(((align_drift) - (alignment)) & ((alignment) - 1));	       \
 	})
 
 #endif /* _BABELTRACE_ALIGN_H */