summaryrefslogtreecommitdiffstats
path: root/debian/patches/rl-attribute.diff
blob: 52647adfd199e1be6636b5ce97ccf46057009c47 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
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