diff options
author | Andy Wingo <wingo@pobox.com> | 2010-08-08 14:15:47 +0200 |
---|---|---|
committer | Andy Wingo <wingo@pobox.com> | 2010-08-08 14:15:47 +0200 |
commit | 8a4ed2dd34c86eb451c5555a85f64f3fbdf9cef6 (patch) | |
tree | 592132af4f874860a2202420842b0c9c24af2b2b /libguile/deprecated.c | |
parent | 220058a8353815f2cefa67e2510b7132991cf7a7 (diff) | |
download | guile-8a4ed2dd34c86eb451c5555a85f64f3fbdf9cef6.tar.gz |
remove "discouraged" infrastructure
* libguile/discouraged.h: Remove.
* libguile/deprecated.c (scm_internal_select, scm_thread_sleep)
(scm_thread_usleep): Deprecate formerly discouraged names.
* libguile/eq.h (SCM_EQ_P):
* libguile/pairs.h (SCM_NULLP, SCM_NNULLP, SCM_CONSP, SCM_NCONSP):
* libguile/boolean.h (SCM_FALSEP, SCM_NFALSEP, SCM_BOOLP, SCM_BOOL):
(SCM_NEGATE_BOOL, SCM_BOOL_NOT): Undiscourage these names, because I'm
not sure deprecating them will do any good.
* libguile.h:
* libguile/gen-scmconfig.c:
* libguile/numbers.c:
* libguile/init.c:
* libguile/Makefile.am:
* configure.ac: Remove bits that referenced discouraged.h, and dealt
with the "discouraging" system.
Diffstat (limited to 'libguile/deprecated.c')
-rw-r--r-- | libguile/deprecated.c | 28 |
1 files changed, 27 insertions, 1 deletions
diff --git a/libguile/deprecated.c b/libguile/deprecated.c index 75591524e..648efe9ac 100644 --- a/libguile/deprecated.c +++ b/libguile/deprecated.c @@ -34,7 +34,6 @@ #include "libguile/bytevectors.h" #include "libguile/bitvectors.h" #include "libguile/deprecated.h" -#include "libguile/discouraged.h" #include "libguile/deprecation.h" #include "libguile/snarf.h" #include "libguile/validate.h" @@ -2333,6 +2332,33 @@ scm_c_make_keyword (const char *s) return scm_from_locale_keyword (s); } +unsigned int +scm_thread_sleep (unsigned int t) +{ + scm_c_issue_deprecation_warning + ("`scm_thread_sleep' is deprecated. Use scm_std_sleep instead."); + return scm_std_sleep (t); +} + +unsigned long +scm_thread_usleep (unsigned long t) +{ + scm_c_issue_deprecation_warning + ("`scm_thread_usleep' is deprecated. Use scm_std_usleep instead."); + return scm_std_usleep (t); +} + +int scm_internal_select (int fds, + SELECT_TYPE *rfds, + SELECT_TYPE *wfds, + SELECT_TYPE *efds, + struct timeval *timeout) +{ + scm_c_issue_deprecation_warning + ("`scm_internal_select' is deprecated. Use scm_std_select instead."); + return scm_std_select (fds, rfds, wfds, efds, timeout); +} + void |