summaryrefslogtreecommitdiff
path: root/libguile/threads.c
diff options
context:
space:
mode:
authorMark H Weaver <mhw@netris.org>2014-04-25 02:06:01 -0400
committerMark H Weaver <mhw@netris.org>2014-04-25 02:06:01 -0400
commit475772ea57c97d0fa0f9ed9303db137d9798ddd3 (patch)
tree99a9ba2ea0b044552016d41c5c9197bbac66d97f /libguile/threads.c
parent0e92ef40d047696eb3334405b2dd32f51ca55006 (diff)
parente0da53b4fe4abee2cdcd97fe46eeefcaab1da631 (diff)
downloadguile-475772ea57c97d0fa0f9ed9303db137d9798ddd3.tar.gz
Merge branch 'stable-2.0'v2.1.0
Conflicts: GUILE-VERSION NEWS guile-readline/ice-9/readline.scm libguile/async.c libguile/backtrace.c libguile/deprecated.h libguile/gc-malloc.c libguile/gdbint.c libguile/init.c libguile/ioext.c libguile/mallocs.c libguile/print.c libguile/rw.c libguile/scmsigs.c libguile/script.c libguile/simpos.c libguile/snarf.h libguile/strports.c libguile/threads.c libguile/vm-i-scheme.c libguile/vm-i-system.c module/srfi/srfi-18.scm test-suite/Makefile.am test-suite/standalone/test-num2integral.c
Diffstat (limited to 'libguile/threads.c')
-rw-r--r--libguile/threads.c14
1 files changed, 2 insertions, 12 deletions
diff --git a/libguile/threads.c b/libguile/threads.c
index dd04f6ff9..bcf1e0d63 100644
--- a/libguile/threads.c
+++ b/libguile/threads.c
@@ -1,6 +1,6 @@
/* Copyright (C) 1995, 1996, 1997, 1998, 2000, 2001, 2002, 2003, 2004,
- * 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014
- * Free Software Foundation, Inc.
+ * 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013,
+ * 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
@@ -29,9 +29,7 @@
#include "libguile/_scm.h"
#include <stdlib.h>
-#if HAVE_UNISTD_H
#include <unistd.h>
-#endif
#include <stdio.h>
#ifdef HAVE_STRING_H
@@ -1779,14 +1777,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,