summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark H Weaver <mhw@netris.org>2014-02-12 17:47:13 -0500
committerMark H Weaver <mhw@netris.org>2014-02-12 20:53:29 -0500
commite1d7a93bb286d691069d47063d1ce5baabd7a35d (patch)
treeca593bd27c47bf3a1da679896deb1d73d161b622
parentf9d4a040b4719fca2a433c01b680679d155ec981 (diff)
downloadguile-e1d7a93bb286d691069d47063d1ce5baabd7a35d.tar.gz
Rely on Gnulib for 'select', 'lstat', and 'mkstemp'.
* libguile/iselect.h: * libguile/threads.c: * libguile/deprecated.h: Rely on Gnulib for sys/select.h. * libguile/filesys.c: Rely on Gnulib for 'lstat' and 'mkstemp'.
-rw-r--r--libguile/deprecated.h2
-rw-r--r--libguile/filesys.c6
-rw-r--r--libguile/iselect.h4
-rw-r--r--libguile/threads.c8
4 files changed, 0 insertions, 20 deletions
diff --git a/libguile/deprecated.h b/libguile/deprecated.h
index 5f95f2711..4d7819761 100644
--- a/libguile/deprecated.h
+++ b/libguile/deprecated.h
@@ -742,13 +742,11 @@ SCM_DEPRECATED SCM scm_c_make_keyword (const char *s);
SCM_DEPRECATED unsigned int scm_thread_sleep (unsigned int);
SCM_DEPRECATED unsigned long scm_thread_usleep (unsigned long);
-#if SCM_HAVE_SYS_SELECT_H
SCM_DEPRECATED int scm_internal_select (int fds,
fd_set *rfds,
fd_set *wfds,
fd_set *efds,
struct timeval *timeout);
-#endif
/* Deprecated because the cuserid call is deprecated.
*/
diff --git a/libguile/filesys.c b/libguile/filesys.c
index 5f6208d82..c261928f5 100644
--- a/libguile/filesys.c
+++ b/libguile/filesys.c
@@ -561,7 +561,6 @@ SCM_DEFINE (scm_stat, "stat", 1, 1, 0,
}
#undef FUNC_NAME
-#ifdef HAVE_LSTAT
SCM_DEFINE (scm_lstat, "lstat", 1, 0, 0,
(SCM str),
"Similar to @code{stat}, but does not follow symbolic links, i.e.,\n"
@@ -584,7 +583,6 @@ SCM_DEFINE (scm_lstat, "lstat", 1, 0, 0,
return scm_stat2scm (&stat_temp);
}
#undef FUNC_NAME
-#endif /* HAVE_LSTAT */
#ifdef HAVE_POSIX
@@ -1467,10 +1465,6 @@ SCM_DEFINE (scm_umask, "umask", 0, 1, 0,
}
#undef FUNC_NAME
-#ifndef HAVE_MKSTEMP
-extern int mkstemp (char *);
-#endif
-
SCM_DEFINE (scm_mkstemp, "mkstemp!", 1, 0, 0,
(SCM tmpl),
"Create a new unique file in the file system and return a new\n"
diff --git a/libguile/iselect.h b/libguile/iselect.h
index 092fb07bf..1272b8d27 100644
--- a/libguile/iselect.h
+++ b/libguile/iselect.h
@@ -28,8 +28,6 @@
/* Needed for FD_SET on some systems. */
#include <sys/types.h>
-#if SCM_HAVE_SYS_SELECT_H
-
#include <sys/select.h>
SCM_API int scm_std_select (int fds,
@@ -40,8 +38,6 @@ SCM_API int scm_std_select (int fds,
#define SELECT_TYPE fd_set
-#endif /* SCM_HAVE_SYS_SELECT_H */
-
#endif /* SCM_ISELECT_H */
/*
diff --git a/libguile/threads.c b/libguile/threads.c
index b84ddbdd6..8fddbce89 100644
--- a/libguile/threads.c
+++ b/libguile/threads.c
@@ -1884,14 +1884,6 @@ do_std_select (void *args)
return NULL;
}
-#if !SCM_HAVE_SYS_SELECT_H
-static int scm_std_select (int nfds,
- fd_set *readfds,
- fd_set *writefds,
- fd_set *exceptfds,
- struct timeval *timeout);
-#endif
-
int
scm_std_select (int nfds,
fd_set *readfds,