summaryrefslogtreecommitdiffstats
path: root/debian/patches/rl-attribute.diff
diff options
context:
space:
mode:
Diffstat (limited to 'debian/patches/rl-attribute.diff')
-rw-r--r--debian/patches/rl-attribute.diff32
1 files changed, 32 insertions, 0 deletions
diff --git a/debian/patches/rl-attribute.diff b/debian/patches/rl-attribute.diff
new file mode 100644
index 0000000..52647ad
--- /dev/null
+++ b/debian/patches/rl-attribute.diff
@@ -0,0 +1,32 @@
+rl-attribute.dpatch by <doko@debian.org>
+
+Do not redefine __attribute__, define macro __rl_attribute__
+
+--- a/readline.h
++++ b/readline.h
+@@ -403,7 +403,7 @@ extern void rl_deactivate_mark PARAMS((v
+ extern int rl_mark_active_p PARAMS((void));
+
+ #if defined (USE_VARARGS) && defined (PREFER_STDARG)
+-extern int rl_message (const char *, ...) __attribute__((__format__ (printf, 1, 2)));
++extern int rl_message (const char *, ...) __rl_attribute__((__format__ (printf, 1, 2)));
+ #else
+ extern int rl_message ();
+ #endif
+--- a/rlstdc.h
++++ b/rlstdc.h
+@@ -36,10 +36,10 @@
+ # endif
+ #endif
+
+-#ifndef __attribute__
+-# if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 8)
+-# define __attribute__(x)
+-# endif
++#if defined(__GNUC__) && __GNUC__ >= 2
++# define __rl_attribute__(x) __attribute__(x)
++#else
++# define __rl_attribute__(x)
+ #endif
+
+ /* Moved from config.h.in because readline.h:rl_message depends on these