[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Guile-commits] GNU Guile branch, master, updated. release_1-9-5-225-g66
|
From: |
Ludovic Courtès |
|
Subject: |
[Guile-commits] GNU Guile branch, master, updated. release_1-9-5-225-g66e18d1 |
|
Date: |
Tue, 15 Dec 2009 00:11:39 +0000 |
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Guile".
http://git.savannah.gnu.org/cgit/guile.git/commit/?id=66e18d1c7ce8fe24614cf3d052d4174cfa37831d
The branch, master has been updated
via 66e18d1c7ce8fe24614cf3d052d4174cfa37831d (commit)
via 5c1463635749c0817391d32f82021a8dc07ddb96 (commit)
via 4ea57d5b482eafe62af744899d957f87eba1f791 (commit)
via f65e0168d59d17d35c414455660e445d3d1c6336 (commit)
via 1bf291e497eb4deb62533d5e7a1d32d519577878 (commit)
via 62316c7f818340d0da203c802c1e1a9077ffddd6 (commit)
via ab33782cb3c491e4a2da81b7c48f93e259071041 (commit)
via 3dbbe28dfd90cd7bf68d8d07771dffc724064311 (commit)
via cd169c5a2284c019b3909de67fc0e3f2b0a5dd44 (commit)
from 93dbc31b9aa9442ad49cf41677bee6e9f1d24306 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 66e18d1c7ce8fe24614cf3d052d4174cfa37831d
Author: Ludovic Courtès <address@hidden>
Date: Tue Dec 15 01:11:01 2009 +0100
Use portable shell in `meta/uninstalled-env'.
* meta/uninstalled-env.in: Don't use the `-q' and `-E' options, which are
specific to GNU grep. Don't set-and-export environment variables at
once since this is a GNU Bash extension.
commit 5c1463635749c0817391d32f82021a8dc07ddb96
Author: Ludovic Courtès <address@hidden>
Date: Tue Dec 15 01:00:36 2009 +0100
Use the right `grep' command.
* libguile/Makefile.am (.c.i): Use $(GREP), not `grep'.
(check_signals, check_errnos): Use $(EGREP), not `egrep'.
commit 4ea57d5b482eafe62af744899d957f87eba1f791
Author: Ludovic Courtès <address@hidden>
Date: Tue Dec 15 00:59:14 2009 +0100
Remove GNU Make-specific function call.
* libguile/Makefile.am (c-tokenize.$(OBJEXT)): Remove use of GNU Make's
`filter-out' function.
commit f65e0168d59d17d35c414455660e445d3d1c6336
Author: Ludovic Courtès <address@hidden>
Date: Tue Dec 15 00:53:13 2009 +0100
Remove extraneous semicolon after `SCM_ARRAY_IMPLEMENTATION' & co.
* libguile/bitvectors.c, libguile/srfi-4.c, libguile/strings.c,
libguile/vectors.c: Remove extraneous semicolon after
`SCM_ARRAY_IMPLEMENTATION' and `SCM_VECTOR_IMPLEMENTATION'
invocations.
commit 1bf291e497eb4deb62533d5e7a1d32d519577878
Author: Ludovic Courtès <address@hidden>
Date: Tue Dec 15 00:45:14 2009 +0100
Remove extraneous functions from `AC_REPLACE_FUNCS'.
* configure.ac: Remove `inet_aton' and `putenv' from `AC_REPLACE_FUNCS'.
commit 62316c7f818340d0da203c802c1e1a9077ffddd6
Author: Ludovic Courtès <address@hidden>
Date: Tue Dec 15 00:43:32 2009 +0100
Avoid `SCM_UNPACK ()' in constant expressions.
They made Sun C 5.8 emit a warning such as:
line 71: warning: dead part of constant expression is nonconstant
* libguile/print.c (scm_print_opts): Don't use `SCM_UNPACK ()' here.
* libguile/read.c (scm_read_opts): Likewise.
commit ab33782cb3c491e4a2da81b7c48f93e259071041
Author: Ludovic Courtès <address@hidden>
Date: Tue Dec 15 00:38:50 2009 +0100
Remove `return' from `void' function.
* libguile/print.c (scm_print_symbol_name): Remove `return' statement.
commit 3dbbe28dfd90cd7bf68d8d07771dffc724064311
Author: Ludovic Courtès <address@hidden>
Date: Mon Dec 14 23:11:47 2009 +0100
Don't use GCC zero-length arrays.
* libguile/frames.c, libguile/objcodes.c, libguile/programs.c,
libguile/vm-engine.c, libguile/vm-i-system.c, libguile/vm.c: Use
`SCM_C_OBJCODE_BASE ()' instead of accessing the `base' field of
`struct scm_objcode'.
* libguile/objcodes.h (struct scm_objcode)[base]: Remove.
commit cd169c5a2284c019b3909de67fc0e3f2b0a5dd44
Author: Ludovic Courtès <address@hidden>
Date: Mon Dec 14 15:21:54 2009 +0100
Remove uses of the non-standard `__FUNCTION__'.
* libguile/gc.c (scm_gc_sweep): Replace `__FUNCTION__' by `FUNC_NAME'.
* libguile/read.c (scm_read_r6rs_block_comment): Likewise.
-----------------------------------------------------------------------
Summary of changes:
configure.ac | 2 +-
libguile/Makefile.am | 12 ++++++------
libguile/arrays.c | 2 +-
libguile/bitvectors.c | 4 ++--
libguile/frames.c | 9 +++++++--
libguile/gc.c | 5 +----
libguile/objcodes.c | 18 ++++++++++--------
libguile/objcodes.h | 14 ++++++++++----
libguile/print.c | 5 ++---
libguile/programs.c | 5 ++++-
libguile/read.c | 4 ++--
libguile/srfi-4.c | 2 +-
libguile/strings.c | 4 ++--
libguile/vectors.c | 6 +++---
libguile/vm-engine.c | 2 +-
libguile/vm-i-system.c | 6 +++---
libguile/vm.c | 2 +-
meta/uninstalled-env.in | 10 ++++++----
18 files changed, 63 insertions(+), 49 deletions(-)
diff --git a/configure.ac b/configure.ac
index 1393d87..35c2ed9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1108,7 +1108,7 @@ if test "$enable_regex" = yes; then
fi
fi
-AC_REPLACE_FUNCS(inet_aton putenv strerror memmove mkstemp)
+AC_REPLACE_FUNCS([strerror memmove mkstemp])
AC_CHECK_HEADERS(floatingpoint.h ieeefp.h nan.h)
diff --git a/libguile/Makefile.am b/libguile/Makefile.am
index c453c84..3e93a98 100644
--- a/libguile/Makefile.am
+++ b/libguile/Makefile.am
@@ -84,7 +84,7 @@ c-tokenize.$(OBJEXT): c-tokenize.c
if [ "$(cross_compiling)" = "yes" ]; then \
$(CC_FOR_BUILD) $(DEFS) $(AM_CPPFLAGS) -c -o $@ $<; \
else \
- $(filter-out -Werror,$(COMPILE)) -c -o $@ $<; \
+ $(COMPILE) -c -o $@ $<; \
fi
## Override default rule; this should run on BUILD host.
@@ -400,7 +400,7 @@ EXTRA_DOT_DOC_FILES = @EXTRA_DOT_DOC_FILES@
DOT_I_FILES = vm-i-system.i vm-i-scheme.i vm-i-loader.i
.c.i:
- grep '^VM_DEFINE' $< > $@
+ $(GREP) '^VM_DEFINE' $< > $@
BUILT_SOURCES = cpp_err_symbols.c cpp_sig_symbols.c libpath.h \
version.h scmconfig.h \
@@ -707,10 +707,10 @@ cpp_sig_symbols.c: cpp_sig_symbols.in cpp_cnvt.awk
## Create a new version of the cpp_sig_symbols.in file, including all SIGXXX
## macros defined on this platform.
check_signals:
- gcc -undef -dM -E $(srcdir)/cpp_signal.c | egrep ' SIG[A-Z]+' \
+ gcc -undef -dM -E $(srcdir)/cpp_signal.c | $(EGREP) ' SIG[A-Z]+' \
| cut -f2 -d' ' | sort > cpp_sig_symbols_here
diff -u $(srcdir)/cpp_sig_symbols.in cpp_sig_symbols_here \
- | egrep '^\+S' \
+ | $(EGREP) '^\+S' \
| cut -c2- > cpp_sig_symbols_diff
if test -s cpp_sig_symbols_diff ; then \
cat $(srcdir)/cpp_sig_symbols.in cpp_sig_symbols_diff \
@@ -722,10 +722,10 @@ check_signals:
## Likewise for cpp_err_symbols.in.
check_errnos:
- gcc -undef -dM -E $(srcdir)/cpp_errno.c | egrep ' E.+' \
+ gcc -undef -dM -E $(srcdir)/cpp_errno.c | $(EGREP) ' E.+' \
| cut -f2 -d' ' | sort > cpp_err_symbols_here
diff -u $(srcdir)/cpp_err_symbols.in cpp_err_symbols_here \
- | egrep '^\+E' \
+ | $(EGREP) '^\+E' \
| cut -c2- > cpp_err_symbols_diff
if test -s cpp_err_symbols_diff ; then \
cat $(srcdir)/cpp_err_symbols.in cpp_err_symbols_diff \
diff --git a/libguile/arrays.c b/libguile/arrays.c
index 741cc56..39d1067 100644
--- a/libguile/arrays.c
+++ b/libguile/arrays.c
@@ -1129,7 +1129,7 @@ array_get_handle (SCM array, scm_t_array_handle *h)
SCM_ARRAY_IMPLEMENTATION (SCM_SMOB_TYPE_BITS (scm_i_tc16_array),
SCM_SMOB_TYPE_MASK,
array_handle_ref, array_handle_set,
- array_get_handle);
+ array_get_handle)
void
scm_init_arrays ()
diff --git a/libguile/bitvectors.c b/libguile/bitvectors.c
index 3e23adf..67f5abd 100644
--- a/libguile/bitvectors.c
+++ b/libguile/bitvectors.c
@@ -881,8 +881,8 @@ bitvector_get_handle (SCM bv, scm_t_array_handle *h)
SCM_ARRAY_IMPLEMENTATION (SCM_SMOB_TYPE_BITS (scm_tc16_bitvector),
SCM_SMOB_TYPE_MASK,
bitvector_handle_ref, bitvector_handle_set,
- bitvector_get_handle);
-SCM_VECTOR_IMPLEMENTATION (SCM_ARRAY_ELEMENT_TYPE_BIT, scm_make_bitvector);
+ bitvector_get_handle)
+SCM_VECTOR_IMPLEMENTATION (SCM_ARRAY_ELEMENT_TYPE_BIT, scm_make_bitvector)
void
scm_init_bitvectors ()
diff --git a/libguile/frames.c b/libguile/frames.c
index 80c556b..5c61eb0 100644
--- a/libguile/frames.c
+++ b/libguile/frames.c
@@ -111,7 +111,8 @@ SCM_DEFINE (scm_frame_source, "frame-source", 1, 0, 0,
bp = SCM_PROGRAM_DATA (SCM_FRAME_PROGRAM (fp));
return scm_c_program_source (SCM_FRAME_PROGRAM (fp),
- SCM_VM_FRAME_IP (frame) - bp->base);
+ SCM_VM_FRAME_IP (frame)
+ - SCM_C_OBJCODE_BASE (bp));
}
#undef FUNC_NAME
@@ -219,10 +220,14 @@ SCM_DEFINE (scm_frame_instruction_pointer,
"frame-instruction-pointer", 1, 0, 0,
"")
#define FUNC_NAME s_scm_frame_instruction_pointer
{
+ const struct scm_objcode *c_objcode;
+
SCM_VALIDATE_VM_FRAME (1, frame);
+
+ c_objcode = SCM_PROGRAM_DATA (scm_frame_procedure (frame));
return scm_from_ulong ((unsigned long)
(SCM_VM_FRAME_IP (frame)
- - SCM_PROGRAM_DATA (scm_frame_procedure
(frame))->base));
+ - SCM_C_OBJCODE_BASE (c_objcode)));
}
#undef FUNC_NAME
diff --git a/libguile/gc.c b/libguile/gc.c
index 38051e1..ff762d6 100644
--- a/libguile/gc.c
+++ b/libguile/gc.c
@@ -826,13 +826,10 @@ scm_gc_sweep (void)
#define FUNC_NAME "scm_gc_sweep"
{
/* FIXME */
- fprintf (stderr, "%s: doing nothing\n", __FUNCTION__);
+ fprintf (stderr, "%s: doing nothing\n", FUNC_NAME);
}
-
#undef FUNC_NAME
-
-
/*
Local Variables:
c-file-style: "gnu"
diff --git a/libguile/objcodes.c b/libguile/objcodes.c
index 1b896df..87ffaa5 100644
--- a/libguile/objcodes.c
+++ b/libguile/objcodes.c
@@ -106,17 +106,19 @@ scm_c_make_objcode_slice (SCM parent, const scm_t_uint8
*ptr)
#define FUNC_NAME "make-objcode-slice"
{
const struct scm_objcode *data, *parent_data;
+ const scm_t_uint8 *parent_base;
SCM ret;
SCM_VALIDATE_OBJCODE (1, parent);
parent_data = SCM_OBJCODE_DATA (parent);
-
- if (ptr < parent_data->base
- || ptr >= (parent_data->base + parent_data->len + parent_data->metalen
+ parent_base = SCM_C_OBJCODE_BASE (parent_data);
+
+ if (ptr < parent_base
+ || ptr >= (parent_base + parent_data->len + parent_data->metalen
- sizeof (struct scm_objcode)))
scm_misc_error (FUNC_NAME, "offset out of bounds (~a vs ~a + ~a + ~a)",
- scm_list_4 (scm_from_ulong ((unsigned long)ptr),
- scm_from_ulong ((unsigned
long)parent_data->base),
+ scm_list_4 (scm_from_ulong ((unsigned long) ptr),
+ scm_from_ulong ((unsigned long) parent_base),
scm_from_uint32 (parent_data->len),
scm_from_uint32 (parent_data->metalen)));
@@ -125,9 +127,9 @@ scm_c_make_objcode_slice (SCM parent, const scm_t_uint8
*ptr)
assert ((((scm_t_bits) ptr) &
(alignof_type (struct scm_objcode) - 1UL)) == 0);
- data = (struct scm_objcode*)ptr;
- if (data->base + data->len + data->metalen > parent_data->base +
parent_data->len + parent_data->metalen)
- abort ();
+ data = (struct scm_objcode*) ptr;
+ assert (SCM_C_OBJCODE_BASE (data) + data->len + data->metalen
+ <= parent_base + parent_data->len + parent_data->metalen);
SCM_NEWSMOB2 (ret, scm_tc16_objcode, data, parent);
SCM_SET_SMOB_FLAGS (ret, SCM_F_OBJCODE_IS_SLICE);
diff --git a/libguile/objcodes.h b/libguile/objcodes.h
index ab4db3d..4627cfb 100644
--- a/libguile/objcodes.h
+++ b/libguile/objcodes.h
@@ -21,14 +21,20 @@
#include <libguile.h>
-/* objcode data should be directly mappable to this C structure. */
-struct scm_objcode {
+/* Objcode data should be directly mappable to this C structure. */
+struct scm_objcode
+{
scm_t_uint32 len; /* the maximum index of base[] */
scm_t_uint32 metalen; /* well, i lie. this many bytes at the end of
base[] for metadata */
- scm_t_uint8 base[0];
+ /* In C99, we'd have:
+ scm_t_uint8 base[]; */
};
+/* Return a pointer to the base of objcode OBJ. */
+#define SCM_C_OBJCODE_BASE(obj) \
+ ((scm_t_uint8 *)(obj) + sizeof (struct scm_objcode))
+
#define SCM_F_OBJCODE_IS_MMAP (1<<0)
#define SCM_F_OBJCODE_IS_U8VECTOR (1<<1)
#define SCM_F_OBJCODE_IS_SLICE (1<<2)
@@ -42,7 +48,7 @@ SCM_API scm_t_bits scm_tc16_objcode;
#define SCM_OBJCODE_LEN(x) (SCM_OBJCODE_DATA (x)->len)
#define SCM_OBJCODE_META_LEN(x) (SCM_OBJCODE_DATA (x)->metalen)
#define SCM_OBJCODE_TOTAL_LEN(x) (SCM_OBJCODE_LEN (x) + SCM_OBJCODE_META_LEN
(x))
-#define SCM_OBJCODE_BASE(x) (SCM_OBJCODE_DATA (x)->base)
+#define SCM_OBJCODE_BASE(x) (SCM_C_OBJCODE_BASE (SCM_OBJCODE_DATA (x)))
#define SCM_OBJCODE_IS_MMAP(x) (SCM_SMOB_FLAGS (x) & SCM_F_OBJCODE_IS_MMAP)
#define SCM_OBJCODE_IS_U8VECTOR(x) (SCM_SMOB_FLAGS (x) &
SCM_F_OBJCODE_IS_U8VECTOR)
diff --git a/libguile/print.c b/libguile/print.c
index efb3081..d50df2d 100644
--- a/libguile/print.c
+++ b/libguile/print.c
@@ -78,7 +78,7 @@ static const char *iflagnames[] =
SCM_SYMBOL (sym_reader, "reader");
scm_t_option scm_print_opts[] = {
- { SCM_OPTION_SCM, "closure-hook", SCM_UNPACK (SCM_BOOL_F),
+ { SCM_OPTION_SCM, "closure-hook", (unsigned long) SCM_BOOL_F,
"Hook for printing closures (should handle macros as well)." },
{ SCM_OPTION_BOOLEAN, "source", 0,
"Print closures with source." },
@@ -92,7 +92,6 @@ scm_t_option scm_print_opts[] = {
"'reader' quotes them when the reader option 'keywords' is not '#f'."
},
{ 0 },
-
};
SCM_DEFINE (scm_print_options, "print-options-interface", 0, 1, 0,
@@ -399,7 +398,7 @@ void
scm_print_symbol_name (const char *str, size_t len, SCM port)
{
SCM symbol = scm_from_locale_symboln (str, len);
- return scm_i_print_symbol_name (symbol, port);
+ scm_i_print_symbol_name (symbol, port);
}
/* Print generally. Handles both write and display according to PSTATE.
diff --git a/libguile/programs.c b/libguile/programs.c
index 7736ea5..336e621 100644
--- a/libguile/programs.c
+++ b/libguile/programs.c
@@ -96,9 +96,12 @@ SCM_DEFINE (scm_program_base, "program-base", 1, 0, 0,
"")
#define FUNC_NAME s_scm_program_base
{
+ const struct scm_objcode *c_objcode;
+
SCM_VALIDATE_PROGRAM (1, program);
- return scm_from_ulong ((unsigned long) SCM_PROGRAM_DATA (program)->base);
+ c_objcode = SCM_PROGRAM_DATA (program);
+ return scm_from_ulong ((unsigned long) SCM_C_OBJCODE_BASE (c_objcode));
}
#undef FUNC_NAME
diff --git a/libguile/read.c b/libguile/read.c
index 5219334..f085944 100644
--- a/libguile/read.c
+++ b/libguile/read.c
@@ -68,7 +68,7 @@ scm_t_option scm_read_opts[] = {
"Record positions of source code expressions." },
{ SCM_OPTION_BOOLEAN, "case-insensitive", 0,
"Convert symbols to lower case."},
- { SCM_OPTION_SCM, "keywords", SCM_UNPACK (SCM_BOOL_F),
+ { SCM_OPTION_SCM, "keywords", (unsigned long) SCM_BOOL_F,
"Style of keyword recognition: #f, 'prefix or 'postfix."},
#if SCM_ENABLE_ELISP
{ SCM_OPTION_BOOLEAN, "elisp-vectors", 0,
@@ -1012,7 +1012,7 @@ scm_read_r6rs_block_comment (scm_t_wchar chr, SCM port)
int c = scm_getc (port);
if (c == EOF)
- scm_i_input_error (__FUNCTION__, port,
+ scm_i_input_error ("scm_read_r6rs_block_comment", port,
"unterminated `#| ... |#' comment", SCM_EOL);
if (opening_seen)
diff --git a/libguile/srfi-4.c b/libguile/srfi-4.c
index 45b9de0..7388619 100644
--- a/libguile/srfi-4.c
+++ b/libguile/srfi-4.c
@@ -886,7 +886,7 @@ uvec_get_handle (SCM v, scm_t_array_handle *h)
SCM_ARRAY_IMPLEMENTATION (SCM_SMOB_TYPE_BITS (scm_tc16_uvec),
SCM_SMOB_TYPE_MASK,
uvec_handle_ref, uvec_handle_set,
- uvec_get_handle);
+ uvec_get_handle)
void
scm_init_srfi_4 (void)
diff --git a/libguile/strings.c b/libguile/strings.c
index 651b019..711da9c 100644
--- a/libguile/strings.c
+++ b/libguile/strings.c
@@ -1893,8 +1893,8 @@ string_get_handle (SCM v, scm_t_array_handle *h)
SCM_ARRAY_IMPLEMENTATION (scm_tc7_string, 0x7f & ~2,
string_handle_ref, string_handle_set,
- string_get_handle);
-SCM_VECTOR_IMPLEMENTATION (SCM_ARRAY_ELEMENT_TYPE_CHAR, scm_make_string);
+ string_get_handle)
+SCM_VECTOR_IMPLEMENTATION (SCM_ARRAY_ELEMENT_TYPE_CHAR, scm_make_string)
void
scm_init_strings ()
diff --git a/libguile/vectors.c b/libguile/vectors.c
index fddf0ce..7875328 100644
--- a/libguile/vectors.c
+++ b/libguile/vectors.c
@@ -627,11 +627,11 @@ vector_get_handle (SCM v, scm_t_array_handle *h)
SCM_ARRAY_IMPLEMENTATION (scm_tc7_vector, 0x7f & ~2,
vector_handle_ref, vector_handle_set,
- vector_get_handle);
+ vector_get_handle)
SCM_ARRAY_IMPLEMENTATION (scm_tc7_wvect, 0x7f & ~2,
vector_handle_ref, vector_handle_set,
- vector_get_handle);
-SCM_VECTOR_IMPLEMENTATION (SCM_ARRAY_ELEMENT_TYPE_SCM, scm_make_vector);
+ vector_get_handle)
+SCM_VECTOR_IMPLEMENTATION (SCM_ARRAY_ELEMENT_TYPE_SCM, scm_make_vector)
void
diff --git a/libguile/vm-engine.c b/libguile/vm-engine.c
index 71cb636..2d28bbf 100644
--- a/libguile/vm-engine.c
+++ b/libguile/vm-engine.c
@@ -92,7 +92,7 @@ VM_NAME (struct scm_vm *vp, SCM program, SCM *argv, int nargs)
CACHE_PROGRAM ();
PUSH (program);
fp = sp + 1;
- ip = bp->base;
+ ip = SCM_C_OBJCODE_BASE (bp);
/* MV-call frame, function & arguments */
PUSH ((SCM)fp); /* dynamic link */
PUSH (0); /* mvra */
diff --git a/libguile/vm-i-system.c b/libguile/vm-i-system.c
index 102c1d7..09da85f 100644
--- a/libguile/vm-i-system.c
+++ b/libguile/vm-i-system.c
@@ -764,7 +764,7 @@ VM_DEFINE_INSTRUCTION (54, call, "call", 1, -1, 1)
ASSERT (SCM_FRAME_MV_RETURN_ADDRESS (fp) == 0);
SCM_FRAME_SET_RETURN_ADDRESS (fp, ip);
SCM_FRAME_SET_MV_RETURN_ADDRESS (fp, 0);
- ip = bp->base;
+ ip = SCM_C_OBJCODE_BASE (bp);
ENTER_HOOK ();
APPLY_HOOK ();
NEXT;
@@ -841,7 +841,7 @@ VM_DEFINE_INSTRUCTION (55, goto_args, "goto/args", 1, -1, 1)
NULLSTACK (old_sp - sp);
- ip = bp->base;
+ ip = SCM_C_OBJCODE_BASE (bp);
ENTER_HOOK ();
APPLY_HOOK ();
@@ -929,7 +929,7 @@ VM_DEFINE_INSTRUCTION (58, mv_call, "mv-call", 4, -1, 1)
ASSERT (SCM_FRAME_MV_RETURN_ADDRESS (fp) == 0);
SCM_FRAME_SET_RETURN_ADDRESS (fp, ip);
SCM_FRAME_SET_MV_RETURN_ADDRESS (fp, mvra);
- ip = bp->base;
+ ip = SCM_C_OBJCODE_BASE (bp);
ENTER_HOOK ();
APPLY_HOOK ();
NEXT;
diff --git a/libguile/vm.c b/libguile/vm.c
index c7ece11..dc57163 100644
--- a/libguile/vm.c
+++ b/libguile/vm.c
@@ -190,7 +190,7 @@ really_make_boot_program (long nargs)
text[1] = (scm_t_uint8)nargs;
bp = scm_malloc (sizeof (struct scm_objcode) + sizeof (text));
- memcpy (bp->base, text, sizeof (text));
+ memcpy (SCM_C_OBJCODE_BASE (bp), text, sizeof (text));
bp->len = sizeof(text);
bp->metalen = 0;
diff --git a/meta/uninstalled-env.in b/meta/uninstalled-env.in
index 58d50ca..3c95153 100644
--- a/meta/uninstalled-env.in
+++ b/meta/uninstalled-env.in
@@ -85,12 +85,14 @@ fi
export GUILE_LOAD_COMPILED_PATH
# Don't look in installed dirs for guile modules
-if ( env | grep -v -q -E '^GUILE_SYSTEM_COMPILED_PATH=' ); then
- export GUILE_SYSTEM_COMPILED_PATH=
+if ( env | grep -v '^GUILE_SYSTEM_COMPILED_PATH=' > /dev/null ); then
+ GUILE_SYSTEM_COMPILED_PATH=
+ export GUILE_SYSTEM_COMPILED_PATH
fi
# Don't look in installed dirs for dlopen-able modules
-if ( env | grep -v -q -E '^GUILE_SYSTEM_EXTENSIONS_PATH=' ); then
- export GUILE_SYSTEM_EXTENSIONS_PATH=
+if ( env | grep -v '^GUILE_SYSTEM_EXTENSIONS_PATH=' > /dev/null ); then
+ GUILE_SYSTEM_EXTENSIONS_PATH=
+ export GUILE_SYSTEM_EXTENSIONS_PATH
fi
# handle LTDL_LIBRARY_PATH (no clobber)
hooks/post-receive
--
GNU Guile
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Guile-commits] GNU Guile branch, master, updated. release_1-9-5-225-g66e18d1,
Ludovic Courtès <=