diff --git a/hardlink.c b/hardlink.c index e661e5f..16d8163 100644 --- a/hardlink.c +++ b/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); } diff --git a/hardlink.spec b/hardlink.spec index ec3d876..0794ac5 100644 --- a/hardlink.spec +++ b/hardlink.spec @@ -1,7 +1,7 @@ Summary: Create a tree of hardlinks Name: hardlink -Version: 1.1 -Release: 4%{?dist} +Version: 1.2 +Release: 1%{?dist} Epoch: 1 Group: System Environment/Base URL: https://pagure.io/hardlink.git @@ -36,6 +36,9 @@ install -D -m 755 hardlink $RPM_BUILD_ROOT%{_sbindir}/hardlink %{_mandir}/man1/hardlink.1* %changelog +* Thu Feb 16 2017 Francisco Javier Tsao Santín - 1:1.2-1 +- Fixed 32 bit build with gcc7 (RH Bugzilla ID 1422989) + * Sun Feb 12 2017 Francisco Javier Tsao Santín - 1:1.1-4 - Fixed source url and description in spec file