diff options
| author | Andy Wingo <wingo@pobox.com> | 2013-03-09 22:25:35 +0100 |
|---|---|---|
| committer | Andy Wingo <wingo@pobox.com> | 2013-03-09 22:25:35 +0100 |
| commit | cdd125e8d475a6d02606322fb4c54dc76bbc8072 (patch) | |
| tree | 5cfff088d25214541c6b63c159551fd14683307d /libguile | |
| parent | 4fd38267bca2987c6340c019a498ea6bacc6c5ec (diff) | |
| download | guile-cdd125e8d475a6d02606322fb4c54dc76bbc8072.tar.gz | |
portability simplification with scmsigs.c and alarm
* configure.ac (alarm): Check for decl.
* libguile/scmsigs.c: Reorder includes to put system includes first.
Fixes include order on mingw. Remove #define for alarm, as we will
use HAVE_DECL_ALARM. Remove #defines for sleep and usleep, as they
are not used.
(scm_alarm): Only define if HAVE_DECL_ALARM.
Diffstat (limited to 'libguile')
| -rw-r--r-- | libguile/scmsigs.c | 34 |
1 files changed, 14 insertions, 20 deletions
diff --git a/libguile/scmsigs.c b/libguile/scmsigs.c index 723d6a8c5..701beb56d 100644 --- a/libguile/scmsigs.c +++ b/libguile/scmsigs.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1995,1996,1997,1998,1999,2000,2001, 2002, 2004, 2006, 2007, 2008, 2009, 2011 Free Software Foundation, Inc. +/* Copyright (C) 1995,1996,1997,1998,1999,2000,2001, 2002, 2004, 2006, 2007, 2008, 2009, 2011, 2013 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 @@ -28,17 +28,6 @@ #include <stdio.h> #include <errno.h> -#include "libguile/_scm.h" - -#include "libguile/async.h" -#include "libguile/eval.h" -#include "libguile/root.h" -#include "libguile/vectors.h" -#include "libguile/threads.h" - -#include "libguile/validate.h" -#include "libguile/scmsigs.h" - #ifdef HAVE_PROCESS_H #include <process.h> /* for mingw */ #endif @@ -51,16 +40,19 @@ #include <sys/time.h> #endif -#ifdef __MINGW32__ -#include <windows.h> -#define alarm(sec) (0) -/* This weird comma expression is because Sleep is void under Windows. */ -#define sleep(sec) (Sleep ((sec) * 1000), 0) -#define usleep(usec) (Sleep ((usec) / 1000), 0) -#endif - #include <full-write.h> +#include "libguile/_scm.h" + +#include "libguile/async.h" +#include "libguile/eval.h" +#include "libguile/root.h" +#include "libguile/vectors.h" +#include "libguile/threads.h" + +#include "libguile/validate.h" +#include "libguile/scmsigs.h" + @@ -499,6 +491,7 @@ SCM_DEFINE (scm_restore_signals, "restore-signals", 0, 0, 0, } #undef FUNC_NAME +#if defined HAVE_ALARM && HAVE_DECL_ALARM SCM_DEFINE (scm_alarm, "alarm", 1, 0, 0, (SCM i), "Set a timer to raise a @code{SIGALRM} signal after the specified\n" @@ -514,6 +507,7 @@ SCM_DEFINE (scm_alarm, "alarm", 1, 0, 0, return scm_from_uint (alarm (scm_to_uint (i))); } #undef FUNC_NAME +#endif /* HAVE_ALARM */ #ifdef HAVE_SETITIMER SCM_DEFINE (scm_setitimer, "setitimer", 5, 0, 0, |