diff options
| author | Erich Eckner <git@eckner.net> | 2019-01-21 10:02:30 +0100 |
|---|---|---|
| committer | Erich Eckner <git@eckner.net> | 2019-01-21 10:02:30 +0100 |
| commit | 54d673f3676d18dc1310d17d4f6cdadd2418d7c8 (patch) | |
| tree | eef0f003adbabfeb0df0cb72b2315a5ff4a6c786 /extra/nasm/0001-Remove-invalid-pure_func-qualifiers.patch | |
| parent | 165b5d95035046775ea689f67af7d1f973820677 (diff) | |
| parent | d3703bea4f193f2e340fe9eb55a6d6d54c9c00b0 (diff) | |
| download | packages-54d673f3676d18dc1310d17d4f6cdadd2418d7c8.tar.xz | |
Merge branch 'master' into i486
Diffstat (limited to 'extra/nasm/0001-Remove-invalid-pure_func-qualifiers.patch')
| -rw-r--r-- | extra/nasm/0001-Remove-invalid-pure_func-qualifiers.patch | 27 |
1 files changed, 27 insertions, 0 deletions
diff --git a/extra/nasm/0001-Remove-invalid-pure_func-qualifiers.patch b/extra/nasm/0001-Remove-invalid-pure_func-qualifiers.patch new file mode 100644 index 00000000..87ec601c --- /dev/null +++ b/extra/nasm/0001-Remove-invalid-pure_func-qualifiers.patch @@ -0,0 +1,27 @@ +From d0dabb46a821b2506681f882af0d5696d2c2bade Mon Sep 17 00:00:00 2001 +From: Michael Simacek <msimacek@redhat.com> +Date: Thu, 8 Feb 2018 14:47:08 +0100 +Subject: [PATCH] Remove invalid pure_func qualifiers + +--- + include/nasmlib.h | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/include/nasmlib.h b/include/nasmlib.h +index 79e866b..c93cef0 100644 +--- a/include/nasmlib.h ++++ b/include/nasmlib.h +@@ -191,8 +191,8 @@ int64_t readstrnum(char *str, int length, bool *warn); + * seg_init: Initialise the segment-number allocator. + * seg_alloc: allocate a hitherto unused segment number. + */ +-void pure_func seg_init(void); +-int32_t pure_func seg_alloc(void); ++void seg_init(void); ++int32_t seg_alloc(void); + + /* + * many output formats will be able to make use of this: a standard +-- +2.14.3 + |