summaryrefslogtreecommitdiffstats
path: root/misc-utils
diff options
context:
space:
mode:
authorFrancisco Javier Tsao Santín2017-02-16 20:08:40 +0100
committerRuediger Meier2018-06-12 14:23:57 +0200
commit92c79dc79e1154f15d6049961287e367fc43aab2 (patch)
tree85273c6a6444c4bed38116b4cf5cab8124f13dad /misc-utils
parentspec file reflects the atomic hardlinking patch; removed cleaning buildroot (... (diff)
downloadkernel-qcow2-util-linux-92c79dc79e1154f15d6049961287e367fc43aab2.tar.gz
kernel-qcow2-util-linux-92c79dc79e1154f15d6049961287e367fc43aab2.tar.xz
kernel-qcow2-util-linux-92c79dc79e1154f15d6049961287e367fc43aab2.zip
Fixed 32 bit build with gcc7 (RH Bugzilla ID 1422989)
Diffstat (limited to 'misc-utils')
-rw-r--r--misc-utils/hardlink.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/misc-utils/hardlink.c b/misc-utils/hardlink.c
index e661e5f0c..16d8163e2 100644
--- a/misc-utils/hardlink.c
+++ b/misc-utils/hardlink.c
@@ -67,12 +67,12 @@ typedef struct _f {
char name[0];
} f;
-inline unsigned int hash(off_t size, time_t mtime)
+__attribute__((always_inline)) inline unsigned int hash(off_t size, time_t mtime)
{
return (size ^ mtime) & (NHASH - 1);
}
-inline int stcmp(struct stat *st1, struct stat *st2, int content_only)
+__attribute__((always_inline)) inline int stcmp(struct stat *st1, struct stat *st2, int content_only)
{
if (content_only)
return st1->st_size != st2->st_size;
@@ -112,7 +112,7 @@ void usage(char *prog)
unsigned int buf[NBUF];
char iobuf1[NIOBUF], iobuf2[NIOBUF];
-inline size_t add2(size_t a, size_t b)
+__attribute__((always_inline)) inline size_t add2(size_t a, size_t b)
{
size_t sum = a + b;
if (sum < a) {
@@ -122,7 +122,7 @@ inline size_t add2(size_t a, size_t b)
return sum;
}
-inline size_t add3(size_t a, size_t b, size_t c)
+__attribute__((always_inline)) inline size_t add3(size_t a, size_t b, size_t c)
{
return add2(add2(a, b), c);
}