1
Fork 0
mirror of https://git.savannah.gnu.org/git/guile.git synced 2025-04-30 03:40:34 +02:00

merge from 1.8 branch

This commit is contained in:
Kevin Ryde 2006-06-17 23:41:24 +00:00
parent c862d0e0c1
commit 22acb29853
2 changed files with 28 additions and 6 deletions

View file

@ -3,6 +3,26 @@
* ice-9/readline.scm: Bump lib file version to libguilereadline-v-18,
matching LIBGUILEREADLINE-VERSION.
2006-05-15 Kevin Ryde <user42@zip.com.au>
* Makefile.am (INCLUDES): Add "-I." to pick up guile-readline-config.h
in snarfer.
2006-04-18 Rob Browning <rlb@defaultvalue.org>
* .cvsignore: Add guile-readline-config.h and
guile-readline-config.h.in.
* readline.c: Don't include Guile private header _scm.h.
Include new guile-readline-config.h private header.
* configure.in: Add AC_CONFIG_AUX_DIR([.]) as suggested in the
autotools documentation. Add
AM_CONFIG_HEADER([guile-readline-config.h]) so that guile-readline
will have its own configure-based config.h equivalent.
(HAVE_RL_PRE_INPUT_HOOK): Add documentation template.
(GUILE_SIGWINCH_SA_RESTART_CLEARED): Add documentation template.
2006-03-12 Neil Jerram <neil@ossau.uklinux.net>
* ice-9/readline.scm (make-completion-function): New.

View file

@ -145,6 +145,7 @@
#define dirent_or_dirent64 CHOOSE_LARGEFILE(dirent,dirent64)
#define fstat_or_fstat64 CHOOSE_LARGEFILE(fstat,fstat64)
#define ftruncate_or_ftruncate64 CHOOSE_LARGEFILE(ftruncate,ftruncate64)
#define lseek_or_lseek64 CHOOSE_LARGEFILE(lseek,lseek64)
#define lstat_or_lstat64 CHOOSE_LARGEFILE(lstat,lstat64)
#define off_t_or_off64_t CHOOSE_LARGEFILE(off_t,off64_t)
#define open_or_open64 CHOOSE_LARGEFILE(open,open64)
@ -158,12 +159,13 @@
#define scm_to_off_t_or_off64_t CHOOSE_LARGEFILE(scm_to_off_t,scm_to_int64)
#if SIZEOF_OFF_T == 4
#define scm_to_off_t scm_to_int32
#define scm_from_off_t scm_from_int32
#endif
#if SIZEOF_OFF_T == 8
#define scm_to_off_t scm_to_int64
#define scm_from_off_t scm_from_int64
# define scm_to_off_t scm_to_int32
# define scm_from_off_t scm_from_int32
#elif SIZEOF_OFF_T == 8
# define scm_to_off_t scm_to_int64
# define scm_from_off_t scm_from_int64
#else
# error sizeof(off_t) is not 4 or 8.
#endif