1
Fork 0
mirror of https://git.savannah.gnu.org/git/guile.git synced 2025-06-16 00:30:21 +02:00

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.
This commit is contained in:
Andy Wingo 2010-08-08 14:15:47 +02:00
parent 220058a835
commit 8a4ed2dd34
13 changed files with 77 additions and 123 deletions

View file

@ -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