Clean-up: remove instances of loop initial declarations

[lttng-tools.git] / src / common / align.h

diff --git a/src/common/align.h b/src/common/align.h
index 928c5b6c131ec36061662f7624fd74a000a87224..81b92f86193d0501286212b3cd9211b13c14bc7b 100644 (file)
--- a/src/common/align.h
+++ b/src/common/align.h
@@ -1,33 +1,37 @@
-#ifndef _LTTNG_ALIGN_H
-#define _LTTNG_ALIGN_H
-
 /*
- * align.h
- *
- * (C) Copyright 2010-2011 - Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
+ * Copyright (C) 2010-2011 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  *
- * 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:
+ * SPDX-License-Identifier: MIT
  *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
  */
 
+#ifndef _LTTNG_ALIGN_H
+#define _LTTNG_ALIGN_H
+
 #include "bug.h"
 #include <unistd.h>
 #include <limits.h>
 
-#ifndef PAGE_SIZE      /* Cygwin limits.h defines its own PAGE_SIZE */
+#ifndef PAGE_SIZE      /* Cygwin limits.h defines its own PAGE_SIZE. */
 #define PAGE_SIZE              sysconf(_SC_PAGE_SIZE)
 #endif
 
+#ifndef PAGE_MASK      /* macOS defines its own PAGE_MASK. */
 #define PAGE_MASK              (~(PAGE_SIZE - 1))
+#endif
+
 #define __ALIGN_MASK(v, mask)  (((v) + (mask)) & ~(mask))
+
+#ifndef ALIGN          /* macOS defines its own ALIGN. */
 #define ALIGN(v, align)                __ALIGN_MASK(v, (__typeof__(v)) (align) - 1)
+#endif
+
+#define __ALIGN_FLOOR_MASK(v, mask)    ((v) & ~(mask))
+
+#ifndef ALIGN_FLOOR
+#define ALIGN_FLOOR(v, align)  __ALIGN_FLOOR_MASK(v, (__typeof__(v)) (align) - 1)
+#endif
+
 #define PAGE_ALIGN(addr)       ALIGN(addr, PAGE_SIZE)
 
 /**