fix for 723299: isxdigit is no longer defined as macro ic c++
This commit is contained in:
parent
a21f7b33a2
commit
80247e28e5
12
readline-6.2-cppmacro.patch
Normal file
12
readline-6.2-cppmacro.patch
Normal file
@ -0,0 +1,12 @@
|
|||||||
|
diff -up readline-6.2/chardefs.h.orig readline-6.2/chardefs.h
|
||||||
|
--- readline-6.2/chardefs.h.orig 2011-08-31 09:24:01.852751855 +0200
|
||||||
|
+++ readline-6.2/chardefs.h 2011-08-31 09:24:07.143685706 +0200
|
||||||
|
@@ -72,7 +72,7 @@
|
||||||
|
# define IN_CTYPE_DOMAIN(c) isascii(c)
|
||||||
|
#endif
|
||||||
|
|
||||||
|
-#if !defined (isxdigit) && !defined (HAVE_ISXDIGIT)
|
||||||
|
+#if !defined (isxdigit) && !defined (HAVE_ISXDIGIT) && !defined (__cplusplus)
|
||||||
|
# define isxdigit(c) (isdigit((c)) || ((c) >= 'a' && (c) <= 'f') || ((c) >= 'A' && (c) <= 'F'))
|
||||||
|
#endif
|
||||||
|
|
@ -1,7 +1,7 @@
|
|||||||
Summary: A library for editing typed command lines
|
Summary: A library for editing typed command lines
|
||||||
Name: readline
|
Name: readline
|
||||||
Version: 6.2
|
Version: 6.2
|
||||||
Release: 2%{?dist}
|
Release: 3%{?dist}
|
||||||
License: GPLv3+
|
License: GPLv3+
|
||||||
Group: System Environment/Libraries
|
Group: System Environment/Libraries
|
||||||
URL: http://cnswww.cns.cwru.edu/php/chet/readline/rltop.html
|
URL: http://cnswww.cns.cwru.edu/php/chet/readline/rltop.html
|
||||||
@ -12,6 +12,8 @@ Patch1: ftp://ftp.cwru.edu/pub/bash/readline-6.2-patches/readline62-001
|
|||||||
Patch20: readline-6.2-shlib.patch
|
Patch20: readline-6.2-shlib.patch
|
||||||
# add TTY input audit support
|
# add TTY input audit support
|
||||||
Patch21: readline-6.1-audit.patch
|
Patch21: readline-6.1-audit.patch
|
||||||
|
# isxdigit should not be defined as macro
|
||||||
|
Patch22: readline-6.2-cppmacro.patch
|
||||||
Requires(post): /sbin/install-info
|
Requires(post): /sbin/install-info
|
||||||
Requires(preun): /sbin/install-info
|
Requires(preun): /sbin/install-info
|
||||||
BuildRequires: ncurses-devel
|
BuildRequires: ncurses-devel
|
||||||
@ -53,6 +55,7 @@ library.
|
|||||||
%patch1 -p0
|
%patch1 -p0
|
||||||
%patch20 -p1 -b .shlib
|
%patch20 -p1 -b .shlib
|
||||||
%patch21 -p1 -b .audit
|
%patch21 -p1 -b .audit
|
||||||
|
%patch22 -p1 -b .cppmacro
|
||||||
|
|
||||||
pushd examples
|
pushd examples
|
||||||
rm -f rlfe/configure
|
rm -f rlfe/configure
|
||||||
@ -130,6 +133,9 @@ fi
|
|||||||
%{_libdir}/lib*.a
|
%{_libdir}/lib*.a
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Wed Aug 31 2011 Lukas Nykryn <lnykryn@redhat.com> 6.2-3
|
||||||
|
- isxdigit is no longer defined as macro ic c++ (#723299)
|
||||||
|
|
||||||
* Tue Mar 01 2011 Miroslav Lichvar <mlichvar@redhat.com> 6.2-2
|
* Tue Mar 01 2011 Miroslav Lichvar <mlichvar@redhat.com> 6.2-2
|
||||||
- include patch 001
|
- include patch 001
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user