* [PATCH] Fix TEMP_FAILURE_RETRY definition when not defined
@ 2016-12-29 23:03 luizluca
2016-12-29 23:57 ` Mark Wielaard
0 siblings, 1 reply; 2+ messages in thread
From: luizluca @ 2016-12-29 23:03 UTC (permalink / raw)
To: elfutils-devel; +Cc: luizluca
From: Luiz Angelo Daros de Luca <luizluca@gmail.com>
https://sourceware.org/bugzilla/show_bug.cgi?id=21001
Signed-off-by: Luiz Angelo Daros de Luca <luizluca@gmail.com>
---
ChangeLog | 4 ++++
lib/crc32_file.c | 1 +
lib/system.h | 2 +-
libdwfl/dwfl_build_id_find_elf.c | 1 +
libdwfl/dwfl_module_getdwarf.c | 1 +
libdwfl/libdwfl_crc32_file.c | 1 -
6 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index bb2ec10..77a7db8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2016-12-29 Luiz Angelo Daros de Luca <luizluca@gmail.com>
+
+ * Fix TEMP_FAILURE_RETRY definition when not defined
+
2016-12-27 Mark Wielaard <mark@klomp.org>
* configure.ac: Set version to 0.168.
diff --git a/lib/crc32_file.c b/lib/crc32_file.c
index a8434d4..57e4298 100644
--- a/lib/crc32_file.c
+++ b/lib/crc32_file.c
@@ -35,6 +35,7 @@
#include <unistd.h>
#include <sys/stat.h>
#include <sys/mman.h>
+#include "system.h"
int
crc32_file (int fd, uint32_t *resp)
diff --git a/lib/system.h b/lib/system.h
index ccd99d6..dde7c4a 100644
--- a/lib/system.h
+++ b/lib/system.h
@@ -81,7 +81,7 @@
do \
__res = expression; \
while (__res == -1 && errno == EINTR); \
- __res; });
+ __res; })
#endif
static inline ssize_t __attribute__ ((unused))
diff --git a/libdwfl/dwfl_build_id_find_elf.c b/libdwfl/dwfl_build_id_find_elf.c
index 903e193..d4737c9 100644
--- a/libdwfl/dwfl_build_id_find_elf.c
+++ b/libdwfl/dwfl_build_id_find_elf.c
@@ -30,6 +30,7 @@
#include <inttypes.h>
#include <fcntl.h>
#include <unistd.h>
+#include "system.h"
int
diff --git a/libdwfl/dwfl_module_getdwarf.c b/libdwfl/dwfl_module_getdwarf.c
index 0e8810b..46caece 100644
--- a/libdwfl/dwfl_module_getdwarf.c
+++ b/libdwfl/dwfl_module_getdwarf.c
@@ -33,6 +33,7 @@
#include <unistd.h>
#include "../libdw/libdwP.h" /* DWARF_E_* values are here. */
#include "../libelf/libelfP.h"
+#include "system.h"
static inline Dwfl_Error
open_elf_file (Elf **elf, int *fd, char **name)
diff --git a/libdwfl/libdwfl_crc32_file.c b/libdwfl/libdwfl_crc32_file.c
index 6b6b7d3..f849128 100644
--- a/libdwfl/libdwfl_crc32_file.c
+++ b/libdwfl/libdwfl_crc32_file.c
@@ -31,6 +31,5 @@
#define crc32_file attribute_hidden __libdwfl_crc32_file
#define crc32 __libdwfl_crc32
-#define LIB_SYSTEM_H 1
#include <libdwflP.h>
#include "../lib/crc32_file.c"
--
2.9.3
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [PATCH] Fix TEMP_FAILURE_RETRY definition when not defined
2016-12-29 23:03 [PATCH] Fix TEMP_FAILURE_RETRY definition when not defined luizluca
@ 2016-12-29 23:57 ` Mark Wielaard
0 siblings, 0 replies; 2+ messages in thread
From: Mark Wielaard @ 2016-12-29 23:57 UTC (permalink / raw)
To: luizluca; +Cc: elfutils-devel
[-- Attachment #1: Type: text/plain, Size: 398 bytes --]
On Thu, Dec 29, 2016 at 09:02:57PM -0200, luizluca@gmail.com wrote:
> From: Luiz Angelo Daros de Luca <luizluca@gmail.com>
>
> https://sourceware.org/bugzilla/show_bug.cgi?id=21001
>
> Signed-off-by: Luiz Angelo Daros de Luca <luizluca@gmail.com>
I did quickly test by forcibly undefining TEMP_FAILURE_RETRY.
Pushed to master.
I did rewrite the ChangeLog entries (see attached).
Thanks,
Mark
[-- Attachment #2: 0001-Fix-TEMP_FAILURE_RETRY-definition-when-not-defined.patch --]
[-- Type: text/plain, Size: 3204 bytes --]
From 925f67e86d127c8917f92bde1cf5abd5b07d0768 Mon Sep 17 00:00:00 2001
From: Luiz Angelo Daros de Luca <luizluca@gmail.com>
Date: Thu, 29 Dec 2016 21:02:57 -0200
Subject: [PATCH] Fix TEMP_FAILURE_RETRY definition when not defined.
https://sourceware.org/bugzilla/show_bug.cgi?id=21001
Signed-off-by: Luiz Angelo Daros de Luca <luizluca@gmail.com>
---
lib/ChangeLog | 5 +++++
lib/crc32_file.c | 1 +
lib/system.h | 2 +-
libdwfl/ChangeLog | 6 ++++++
libdwfl/dwfl_build_id_find_elf.c | 1 +
libdwfl/dwfl_module_getdwarf.c | 1 +
libdwfl/libdwfl_crc32_file.c | 1 -
7 files changed, 15 insertions(+), 2 deletions(-)
diff --git a/lib/ChangeLog b/lib/ChangeLog
index 1fe5906..fcf5b10 100644
--- a/lib/ChangeLog
+++ b/lib/ChangeLog
@@ -1,3 +1,8 @@
+2016-12-29 Luiz Angelo Daros de Luca <luizluca@gmail.com>
+
+ * crc32_file.c: Include system.h.
+ * system.h: Remove semi-colon after TEMP_FAILURE_RETRY definition.
+
2016-12-24 Mark Wielaard <mark@klomp.org>
* version.c: New source file.
diff --git a/lib/crc32_file.c b/lib/crc32_file.c
index a8434d4..57e4298 100644
--- a/lib/crc32_file.c
+++ b/lib/crc32_file.c
@@ -35,6 +35,7 @@
#include <unistd.h>
#include <sys/stat.h>
#include <sys/mman.h>
+#include "system.h"
int
crc32_file (int fd, uint32_t *resp)
diff --git a/lib/system.h b/lib/system.h
index ccd99d6..dde7c4a 100644
--- a/lib/system.h
+++ b/lib/system.h
@@ -81,7 +81,7 @@
do \
__res = expression; \
while (__res == -1 && errno == EINTR); \
- __res; });
+ __res; })
#endif
static inline ssize_t __attribute__ ((unused))
diff --git a/libdwfl/ChangeLog b/libdwfl/ChangeLog
index bc627fe..57671ea 100644
--- a/libdwfl/ChangeLog
+++ b/libdwfl/ChangeLog
@@ -1,3 +1,9 @@
+2016-12-29 Luiz Angelo Daros de Luca <luizluca@gmail.com>
+
+ * dwfl_build_id_find_elf.c: Include system.h.
+ * dwfl_module_getdwarf.c: Likewise.
+ * libdwfl_crc32_file.c: Don't define LIB_SYSTEM_H.
+
2016-11-23 Mark Wielaard <mjw@redhat.com>
* linux-kernel-modules.c: Only include fts.h early if BAD_FTS is
diff --git a/libdwfl/dwfl_build_id_find_elf.c b/libdwfl/dwfl_build_id_find_elf.c
index 903e193..d4737c9 100644
--- a/libdwfl/dwfl_build_id_find_elf.c
+++ b/libdwfl/dwfl_build_id_find_elf.c
@@ -30,6 +30,7 @@
#include <inttypes.h>
#include <fcntl.h>
#include <unistd.h>
+#include "system.h"
int
diff --git a/libdwfl/dwfl_module_getdwarf.c b/libdwfl/dwfl_module_getdwarf.c
index 0e8810b..46caece 100644
--- a/libdwfl/dwfl_module_getdwarf.c
+++ b/libdwfl/dwfl_module_getdwarf.c
@@ -33,6 +33,7 @@
#include <unistd.h>
#include "../libdw/libdwP.h" /* DWARF_E_* values are here. */
#include "../libelf/libelfP.h"
+#include "system.h"
static inline Dwfl_Error
open_elf_file (Elf **elf, int *fd, char **name)
diff --git a/libdwfl/libdwfl_crc32_file.c b/libdwfl/libdwfl_crc32_file.c
index 6b6b7d3..f849128 100644
--- a/libdwfl/libdwfl_crc32_file.c
+++ b/libdwfl/libdwfl_crc32_file.c
@@ -31,6 +31,5 @@
#define crc32_file attribute_hidden __libdwfl_crc32_file
#define crc32 __libdwfl_crc32
-#define LIB_SYSTEM_H 1
#include <libdwflP.h>
#include "../lib/crc32_file.c"
--
2.9.3
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2016-12-29 23:57 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-12-29 23:03 [PATCH] Fix TEMP_FAILURE_RETRY definition when not defined luizluca
2016-12-29 23:57 ` Mark Wielaard
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).