[c5c522c] | 1 | READLINE PATCH REPORT |
---|
| 2 | ===================== |
---|
| 3 | |
---|
| 4 | Readline-Release: 6.3 |
---|
| 5 | Patch-ID: readline63-005 |
---|
| 6 | |
---|
| 7 | Bug-Reported-by: Juergen Daubert <jue@jue.li> |
---|
| 8 | Bug-Reference-ID: <20140303180430.GA7346@jue.netz> |
---|
| 9 | Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-readline/2014-03/msg00002.html |
---|
| 10 | |
---|
| 11 | Bug-Description: |
---|
| 12 | |
---|
| 13 | There are still applications using the deprecated Function/VFunction/etc. |
---|
| 14 | typedefs in rltypedefs.h. This patch restores the typedefs, but attempts |
---|
| 15 | to mark them as deprecated using gcc/clang attributes. Thanks to Max Horn |
---|
| 16 | for the suggestion. |
---|
| 17 | |
---|
| 18 | Patch (apply with `patch -p0'): |
---|
| 19 | |
---|
| 20 | *** ../readline-6.3-patched/rltypedefs.h 2011-03-26 14:53:31.000000000 -0400 |
---|
| 21 | --- rltypedefs.h 2014-04-10 11:30:45.000000000 -0400 |
---|
| 22 | *************** |
---|
| 23 | *** 27,30 **** |
---|
| 24 | --- 27,49 ---- |
---|
| 25 | #endif |
---|
| 26 | |
---|
| 27 | + /* Old-style, attempt to mark as deprecated in some way people will notice. */ |
---|
| 28 | + |
---|
| 29 | + #if !defined (_FUNCTION_DEF) |
---|
| 30 | + # define _FUNCTION_DEF |
---|
| 31 | + |
---|
| 32 | + #if defined(__GNUC__) || defined(__clang__) |
---|
| 33 | + typedef int Function () __attribute__ ((deprecated)); |
---|
| 34 | + typedef void VFunction () __attribute__ ((deprecated)); |
---|
| 35 | + typedef char *CPFunction () __attribute__ ((deprecated)); |
---|
| 36 | + typedef char **CPPFunction () __attribute__ ((deprecated)); |
---|
| 37 | + #else |
---|
| 38 | + typedef int Function (); |
---|
| 39 | + typedef void VFunction (); |
---|
| 40 | + typedef char *CPFunction (); |
---|
| 41 | + typedef char **CPPFunction (); |
---|
| 42 | + #endif |
---|
| 43 | + |
---|
| 44 | + #endif /* _FUNCTION_DEF */ |
---|
| 45 | + |
---|
| 46 | /* New style. */ |
---|
| 47 | |
---|
| 48 | *** ../readline-6.3/patchlevel 2013-11-15 08:11:11.000000000 -0500 |
---|
| 49 | --- patchlevel 2014-03-21 08:28:40.000000000 -0400 |
---|
| 50 | *************** |
---|
| 51 | *** 1,3 **** |
---|
| 52 | # Do not edit -- exists only for use by patch |
---|
| 53 | |
---|
| 54 | ! 4 |
---|
| 55 | --- 1,3 ---- |
---|
| 56 | # Do not edit -- exists only for use by patch |
---|
| 57 | |
---|
| 58 | ! 5 |
---|