[gentoo-commits] gentoo-x86 commit in dev-util/cdecl/files: cdecl-2.5.patch

["Patrick Kursawe (phosphan)" <phosphan@gentoo.org>]

phosphan    09/07/07 18:40:44

  Modified:             cdecl-2.5.patch
  Log:
  Fixing build with glibc-2.10, see bug #276068.
  (Portage version: 2.1.6.13/cvs/Linux i686)

Revision  Changes    Path
1.2                  dev-util/cdecl/files/cdecl-2.5.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/cdecl/files/cdecl-2.5.patch?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/cdecl/files/cdecl-2.5.patch?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/cdecl/files/cdecl-2.5.patch?r1=1.1&r2=1.2

Index: cdecl-2.5.patch
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-util/cdecl/files/cdecl-2.5.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- cdecl-2.5.patch	30 Sep 2003 13:32:23 -0000	1.1
+++ cdecl-2.5.patch	7 Jul 2009 18:40:44 -0000	1.2
@@ -1,5 +1,5 @@
---- cdecl-2.5.orig/Makefile
-+++ cdecl-2.5/Makefile
+--- Makefile
++++ Makefile.new
 @@ -15,9 +15,9 @@
  #
  # add -DUSE_READLINE   To compile in support for the GNU readline library.
@@ -12,8 +12,8 @@
  ALLFILES= makefile cdgram.y cdlex.l cdecl.c cdecl.1 testset testset++
  BINDIR= /usr/bin
  MANDIR= /usr/man/man1
---- cdecl-2.5.orig/cdecl.c
-+++ cdecl-2.5/cdecl.c
+--- cdecl.c
++++ cdecl.c.new
 @@ -67,6 +67,7 @@
  # include <stddef.h>
  # include <string.h>
@@ -31,3 +31,32 @@
    int yywrap(void);
    int dostdin(void);
 
+--- cdecl.c	2009-07-07 13:20:37.000000000 +0200
++++ cdecl.c.new	2009-07-07 13:25:00.000000000 +0200
+@@ -91,7 +91,7 @@
+ #ifdef USE_READLINE
+ # include <readline/readline.h>
+   /* prototypes for functions related to readline() */
+-  char * getline();
++  char * mygetline();
+   char ** attempt_completion(char *, int, int);
+   char * keyword_completion(char *, int);
+   char * command_completion(char *, int);
+@@ -375,7 +375,7 @@
+ static char *line_read = NULL;
+ 
+ /* Read a string, and return a pointer to it.  Returns NULL on EOF. */
+-char * getline ()
++char * mygetline ()
+ {
+   /* If the buffer has already been allocated, return the memory
+      to the free pool. */
+@@ -887,7 +887,7 @@
+ 
+ 	if (!quiet) (void) printf("Type `help' or `?' for help\n");
+ 	ret = 0;
+-	while ((line = getline())) {
++	while ((line = mygetline())) {
+ 	    if (!strcmp(line, "quit") || !strcmp(line, "exit")) {
+ 		free(line);
+ 		return ret;