diff options
| author | Andy Wingo <wingo@pobox.com> | 2008-09-30 21:12:16 +0200 |
|---|---|---|
| committer | Andy Wingo <wingo@pobox.com> | 2008-09-30 21:12:16 +0200 |
| commit | 999f1b26e74a7a8eb9e9e5e479f971e145aa7326 (patch) | |
| tree | 5f80e3cdf6f70d5fae969d5350d17111365efc41 /guile-readline | |
| parent | ac0e91c42dac01b74f89260090273cdb7ff7e791 (diff) | |
| parent | 89bc270db3c207b2210736f066ce18721e0dbc76 (diff) | |
Merge commit 'origin/master' into vm
Conflicts:
doc/Makefile.am
ice-9/Makefile.am
libguile/gc.c
Diffstat (limited to 'guile-readline')
| -rw-r--r-- | guile-readline/.cvsignore | 24 | ||||
| -rw-r--r-- | guile-readline/ChangeLog-2008 (renamed from guile-readline/ChangeLog) | 0 | ||||
| -rw-r--r-- | guile-readline/Makefile.am | 4 | ||||
| -rw-r--r-- | guile-readline/ice-9/.cvsignore | 2 | ||||
| -rw-r--r-- | guile-readline/readline.c | 1 |
5 files changed, 2 insertions, 29 deletions
diff --git a/guile-readline/.cvsignore b/guile-readline/.cvsignore deleted file mode 100644 index 22b5d0d48..000000000 --- a/guile-readline/.cvsignore +++ /dev/null @@ -1,24 +0,0 @@ -*.c.clean.c -*.la -*.lo -*.x -.deps -.libs -Makefile -Makefile.in -aclocal.m4 -autom4te.cache -config.guess -config.log -config.status -config.sub -configure -depcomp -guile-readline-config.h -guile-readline-config.h.in -install-sh -libtool -ltmain.sh -missing -mkinstalldirs -stamp-h1 diff --git a/guile-readline/ChangeLog b/guile-readline/ChangeLog-2008 index 2188b78e1..2188b78e1 100644 --- a/guile-readline/ChangeLog +++ b/guile-readline/ChangeLog-2008 diff --git a/guile-readline/Makefile.am b/guile-readline/Makefile.am index 50523e5b3..94e6f9741 100644 --- a/guile-readline/Makefile.am +++ b/guile-readline/Makefile.am @@ -1,6 +1,6 @@ ## Process this file with Automake to create Makefile.in ## -## Copyright (C) 1998, 1999, 2000, 2001, 2004, 2006, 2007 Free Software Foundation, Inc. +## Copyright (C) 1998, 1999, 2000, 2001, 2004, 2006, 2007, 2008 Free Software Foundation, Inc. ## ## This file is part of GUILE. ## @@ -48,7 +48,7 @@ SUFFIXES = .x .c.x: $(GUILE_SNARF) -o $@ $< $(snarfcppopts) -EXTRA_DIST = LIBGUILEREADLINE-VERSION +EXTRA_DIST = LIBGUILEREADLINE-VERSION ChangeLog-2008 MKDEP = gcc -M -MG $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) diff --git a/guile-readline/ice-9/.cvsignore b/guile-readline/ice-9/.cvsignore deleted file mode 100644 index 282522db0..000000000 --- a/guile-readline/ice-9/.cvsignore +++ /dev/null @@ -1,2 +0,0 @@ -Makefile -Makefile.in diff --git a/guile-readline/readline.c b/guile-readline/readline.c index 9178ebdd2..58599cacc 100644 --- a/guile-readline/readline.c +++ b/guile-readline/readline.c @@ -27,7 +27,6 @@ #ifdef HAVE_RL_GETC_FUNCTION #include "libguile.h" -#include "libguile/gh.h" #include "libguile/iselect.h" #include <stdio.h> |