Skip to content

GitLab

Commit bb39b981 authored by J. R. Okajima's avatar J. R. Okajima
Browse files

Merge branch 'aufs5.0/00base' into aufs5.1/00base

parents b84a5f90 c4ea0e0a
Show whitespace changes
Inline Side-by-side
include/uapi/linux/aufs_type.h
View file @ bb39b981
...@@ -241,7 +241,11 @@ enum { ...@@ -241,7 +241,11 @@ enum {
/* borrowed from linux/include/linux/kernel.h */ /* borrowed from linux/include/linux/kernel.h */
#ifndef ALIGN #ifndef ALIGN
#ifdef _GNU_SOURCE
#define ALIGN(x, a) __ALIGN_MASK(x, (typeof(x))(a)-1) #define ALIGN(x, a) __ALIGN_MASK(x, (typeof(x))(a)-1)
#else
#define ALIGN(x, a) (((x) + (a) - 1) & ~((a) - 1))
#endif
#define __ALIGN_MASK(x, mask) (((x)+(mask))&~(mask)) #define __ALIGN_MASK(x, mask) (((x)+(mask))&~(mask))
#endif #endif
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment