diff options
| author | Mark H Weaver <mhw@netris.org> | 2014-09-30 03:50:47 -0400 |
|---|---|---|
| committer | Mark H Weaver <mhw@netris.org> | 2014-09-30 03:50:47 -0400 |
| commit | 856d318a9f543d8a61fcf61caae7d07102586802 (patch) | |
| tree | 10bd99500c027bbd472253f6cc34f8b1b516d4a1 /libguile/async.h | |
| parent | f7582f9807d9a10fba86f54c4aeaa7444c51a315 (diff) | |
| parent | 3157d455039f137ca5dfa8b9fbc4a3404ce00606 (diff) | |
| download | guile-856d318a9f543d8a61fcf61caae7d07102586802.tar.gz | |
Merge branch 'stable-2.0'
Conflicts:
benchmark-suite/benchmarks/ports.bm
libguile/async.h
libguile/bytevectors.c
libguile/foreign.c
libguile/gsubr.c
libguile/srfi-1.c
libguile/vm-engine.h
libguile/vm-i-scheme.c
module/Makefile.am
module/language/tree-il/analyze.scm
module/language/tree-il/peval.scm
module/scripts/compile.scm
module/scripts/disassemble.scm
test-suite/tests/asm-to-bytecode.test
test-suite/tests/peval.test
test-suite/tests/rdelim.test
Diffstat (limited to 'libguile/async.h')
| -rw-r--r-- | libguile/async.h | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/libguile/async.h b/libguile/async.h index e6fe5237c..00b791449 100644 --- a/libguile/async.h +++ b/libguile/async.h @@ -3,7 +3,8 @@ #ifndef SCM_ASYNC_H #define SCM_ASYNC_H -/* Copyright (C) 1995,1996,1997,1998,2000,2001, 2002, 2004, 2005, 2006, 2008, 2009, 2011 Free Software Foundation, Inc. +/* Copyright (C) 1995-1998, 2000-2002, 2004-2006, 2008, 2009, 2011 + * 2014 Free Software Foundation, Inc. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public License @@ -44,10 +45,10 @@ SCM_API SCM scm_run_asyncs (SCM list_of_a); SCM_API SCM scm_noop (SCM args); SCM_API SCM scm_call_with_blocked_asyncs (SCM proc); SCM_API SCM scm_call_with_unblocked_asyncs (SCM proc); -void *scm_c_call_with_blocked_asyncs (void *(*p) (void *d), void *d); -void *scm_c_call_with_unblocked_asyncs (void *(*p) (void *d), void *d); -void scm_dynwind_block_asyncs (void); -void scm_dynwind_unblock_asyncs (void); +SCM_API void *scm_c_call_with_blocked_asyncs (void *(*p) (void *d), void *d); +SCM_API void *scm_c_call_with_unblocked_asyncs (void *(*p) (void *d), void *d); +SCM_API void scm_dynwind_block_asyncs (void); +SCM_API void scm_dynwind_unblock_asyncs (void); /* Critical sections */ |