Permalink
Browse files

Fix problems with CYGWIN port (sh scripts should not have .bat extens…

…ion, timer related issues which caused process ports to fail)
  • Loading branch information...
1 parent ef8ab1f commit d4b88896c196469b540cbbe2a9d8f39f21ae3fe6 @feeley feeley committed Mar 24, 2011
View
0 bin/gambc-cc.bat.unix.in → bin/gambc-cc.unix.in
File renamed without changes.
View
0 bin/gambc-doc.bat.unix.in → bin/gambc-doc.unix.in
File renamed without changes.
View
40 bin/makefile.in
@@ -70,14 +70,14 @@ GSI_EXECUTABLE_INSTALLED = @ENABLE_INTERPRETER_NAME@@exe@
GSC_EXECUTABLE_INSTALLED = @ENABLE_COMPILER_NAME@@exe@
RCFILES = makefile.in \
-gambc-cc.bat.unix.in gambc-cc.bat.windows.in \
-gambc-doc.bat.unix.in gambc-doc.bat.windows.in
+gambc-cc.unix.in gambc-cc.bat.windows.in \
+gambc-doc.unix.in gambc-doc.bat.windows.in
GENDISTFILES =
DISTFILES = $(RCFILES) $(GENDISTFILES)
-INSTFILES_BIN_PROG = gambc-cc.bat gambc-doc.bat
+INSTFILES_BIN_PROG = gambc-cc@bat@ gambc-doc@bat@
INSTFILES_BIN_LINK_GSI = six@exe@ gsi-script@bat@ six-script@bat@ \
scheme-srfi-0@bat@ scheme-r5rs@bat@ scheme-r4rs@bat@ scheme-ieee-1178-1990@bat@
INSTFILES_BIN_LINK_GSC = gsc-script@bat@
@@ -88,24 +88,24 @@ all:
all-pre:
-all-post: gambc-cc.bat gambc-doc.bat six@exe@ gsi-script@bat@ gsc-script@bat@ six-script@bat@ scheme-srfi-0@bat@ scheme-r5rs@bat@ scheme-r4rs@bat@ scheme-ieee-1178-1990@bat@
+all-post: gambc-cc@bat@ gambc-doc@bat@ six@exe@ gsi-script@bat@ gsc-script@bat@ six-script@bat@ scheme-srfi-0@bat@ scheme-r5rs@bat@ scheme-r4rs@bat@ scheme-ieee-1178-1990@bat@
-gambc-cc.bat: makefile gambc-cc.bat.unix gambc-cc.bat.windows
- rm -f gambc-cc.bat
+gambc-cc@bat@: makefile gambc-cc.unix gambc-cc.bat.windows
+ rm -f gambc-cc@bat@
if test "@bat@" = ""; then \
- cp gambc-cc.bat.unix gambc-cc.bat; \
- chmod +x gambc-cc.bat; \
+ cp gambc-cc.unix gambc-cc@bat@; \
+ chmod +x gambc-cc@bat@; \
else \
- cp gambc-cc.bat.windows gambc-cc.bat; \
+ cp gambc-cc.bat.windows gambc-cc@bat@; \
fi
-gambc-doc.bat: makefile gambc-doc.bat.unix gambc-doc.bat.windows
- rm -f gambc-doc.bat
+gambc-doc@bat@: makefile gambc-doc.unix gambc-doc.bat.windows
+ rm -f gambc-doc@bat@
if test "@bat@" = ""; then \
- cp gambc-doc.bat.unix gambc-doc.bat; \
- chmod +x gambc-doc.bat; \
+ cp gambc-doc.unix gambc-doc@bat@; \
+ chmod +x gambc-doc@bat@; \
else \
- cp gambc-doc.bat.windows gambc-doc.bat; \
+ cp gambc-doc.bat.windows gambc-doc@bat@; \
fi
six@exe@: makefile
@@ -248,8 +248,8 @@ mostlyclean-post:
clean-pre: mostlyclean-pre
clean-post: mostlyclean-post
- rm -f gambc-cc.bat \
- gambc-doc.bat \
+ rm -f gambc-cc@bat@ \
+ gambc-doc@bat@ \
six@exe@ six@exe@.lnk \
gsi-script@bat@ \
gsi-script@bat@.lnk \
@@ -277,8 +277,8 @@ bootclean-post: distclean-post
realclean-pre: bootclean-pre
realclean-post: bootclean-post
- rm -f gambc-cc.bat.unix gambc-cc.bat.windows \
- gambc-doc.bat.unix gambc-doc.bat.windows makefile
+ rm -f gambc-cc.unix gambc-cc.bat.windows \
+ gambc-doc.unix gambc-doc.bat.windows makefile
rc-setup-pre:
$(RC) add $(RCFILES)
@@ -375,13 +375,13 @@ dist-devel-recursive: dist-devel-pre
makefile: makefile.in $(rootfromhere)/config.status
cd $(rootfromhere) && CONFIG_FILES=$(herefromroot)/$@ CONFIG_HEADERS= ./config.status
-gambc-cc.bat.unix: gambc-cc.bat.unix.in $(rootfromhere)/config.status
+gambc-cc.unix: gambc-cc.unix.in $(rootfromhere)/config.status
cd $(rootfromhere) && CONFIG_FILES=$(herefromroot)/$@ CONFIG_HEADERS= ./config.status
gambc-cc.bat.windows: gambc-cc.bat.windows.in $(rootfromhere)/config.status
cd $(rootfromhere) && CONFIG_FILES=$(herefromroot)/$@ CONFIG_HEADERS= ./config.status
-gambc-doc.bat.unix: gambc-doc.bat.unix.in $(rootfromhere)/config.status
+gambc-doc.unix: gambc-doc.unix.in $(rootfromhere)/config.status
cd $(rootfromhere) && CONFIG_FILES=$(herefromroot)/$@ CONFIG_HEADERS= ./config.status
gambc-doc.bat.windows: gambc-doc.bat.windows.in $(rootfromhere)/config.status
View
8 configure
@@ -11274,7 +11274,6 @@ if test "$ENABLE_SHARED" = yes; then
case "$target_os" in
-
mingw* | cygwin*)
LIB_PREFIX="lib"
LIB_EXTENSION=".dll"
@@ -11558,6 +11557,7 @@ GAMBCLIB_DEFS="$GAMBCLIB_DEFS -D___SYS_TYPE_OS=\"\\\"$target_os\\\"\""
GAMBCLIB_DEFS="$GAMBCLIB_DEFS -D___CONFIGURE_COMMAND=\"\\\"$CONFIGURE_COMMAND\\\"\""
GAMBCLIB_DEFS="$GAMBCLIB_DEFS -D___OBJ_EXTENSION=\"\\\"$obj\\\"\""
GAMBCLIB_DEFS="$GAMBCLIB_DEFS -D___EXE_EXTENSION=\"\\\"$exe\\\"\""
+GAMBCLIB_DEFS="$GAMBCLIB_DEFS -D___BAT_EXTENSION=\"\\\"$bat\\\"\""
###############################################################################
@@ -11804,7 +11804,7 @@ $as_echo "no" >&6; }
fi
-ac_config_files="$ac_config_files makefile include/makefile include/gambit.h lib/makefile lib/guide/guidepro lib/guide/makefile lib/guide/images/makefile gsi/makefile gsc/makefile bin/makefile bin/gambc-cc.bat.unix bin/gambc-cc.bat.windows bin/gambc-doc.bat.unix bin/gambc-doc.bat.windows misc/makefile doc/makefile tests/makefile examples/makefile examples/distr-comp/makefile examples/pi/makefile examples/ring/makefile examples/web-repl/makefile examples/web-server/makefile examples/tcltk/makefile examples/Xlib-simple/makefile examples/pthread/makefile examples/misc/makefile examples/iOS/makefile prebuilt/makefile prebuilt/macosx/makefile prebuilt/macosx/build-phase2 prebuilt/windows/makefile prebuilt/windows/build-phase2"
+ac_config_files="$ac_config_files makefile include/makefile include/gambit.h lib/makefile lib/guide/guidepro lib/guide/makefile lib/guide/images/makefile gsi/makefile gsc/makefile bin/makefile bin/gambc-cc.unix bin/gambc-cc.bat.windows bin/gambc-doc.unix bin/gambc-doc.bat.windows misc/makefile doc/makefile tests/makefile examples/makefile examples/distr-comp/makefile examples/pi/makefile examples/ring/makefile examples/web-repl/makefile examples/web-server/makefile examples/tcltk/makefile examples/Xlib-simple/makefile examples/pthread/makefile examples/misc/makefile examples/iOS/makefile prebuilt/makefile prebuilt/macosx/makefile prebuilt/macosx/build-phase2 prebuilt/windows/makefile prebuilt/windows/build-phase2"
cat >confcache <<\_ACEOF
# This file is a shell script that caches the results of configure
@@ -12495,9 +12495,9 @@ do
"gsi/makefile") CONFIG_FILES="$CONFIG_FILES gsi/makefile" ;;
"gsc/makefile") CONFIG_FILES="$CONFIG_FILES gsc/makefile" ;;
"bin/makefile") CONFIG_FILES="$CONFIG_FILES bin/makefile" ;;
- "bin/gambc-cc.bat.unix") CONFIG_FILES="$CONFIG_FILES bin/gambc-cc.bat.unix" ;;
+ "bin/gambc-cc.unix") CONFIG_FILES="$CONFIG_FILES bin/gambc-cc.unix" ;;
"bin/gambc-cc.bat.windows") CONFIG_FILES="$CONFIG_FILES bin/gambc-cc.bat.windows" ;;
- "bin/gambc-doc.bat.unix") CONFIG_FILES="$CONFIG_FILES bin/gambc-doc.bat.unix" ;;
+ "bin/gambc-doc.unix") CONFIG_FILES="$CONFIG_FILES bin/gambc-doc.unix" ;;
"bin/gambc-doc.bat.windows") CONFIG_FILES="$CONFIG_FILES bin/gambc-doc.bat.windows" ;;
"misc/makefile") CONFIG_FILES="$CONFIG_FILES misc/makefile" ;;
"doc/makefile") CONFIG_FILES="$CONFIG_FILES doc/makefile" ;;
View
12 configure.ac
@@ -1479,7 +1479,6 @@ if test "$ENABLE_SHARED" = yes; then
case "$target_os" in
-
mingw* | cygwin*)
LIB_PREFIX="lib"
LIB_EXTENSION=".dll"
@@ -1759,10 +1758,11 @@ emacsdir="\${datadir}/emacs/site-lisp"
GAMBCLIB_DEFS="$GAMBCLIB_DEFS -D___SYS_TYPE_CPU=\"\\\"$target_cpu\\\"\""
GAMBCLIB_DEFS="$GAMBCLIB_DEFS -D___SYS_TYPE_VENDOR=\"\\\"$target_vendor\\\"\""
-GAMBCLIB_DEFS="$GAMBCLIB_DEFS -D___SYS_TYPE_OS=\"\\\"$target_os\\\"\""
-GAMBCLIB_DEFS="$GAMBCLIB_DEFS -D___CONFIGURE_COMMAND=\"\\\"$CONFIGURE_COMMAND\\\"\""
-GAMBCLIB_DEFS="$GAMBCLIB_DEFS -D___OBJ_EXTENSION=\"\\\"$obj\\\"\""
-GAMBCLIB_DEFS="$GAMBCLIB_DEFS -D___EXE_EXTENSION=\"\\\"$exe\\\"\""
+GAMBCLIB_DEFS="$GAMBCLIB_DEFS -D___SYS_TYPE_OS=\"\\\"$target_os\\\"\""
+GAMBCLIB_DEFS="$GAMBCLIB_DEFS -D___CONFIGURE_COMMAND=\"\\\"$CONFIGURE_COMMAND\\\"\""
+GAMBCLIB_DEFS="$GAMBCLIB_DEFS -D___OBJ_EXTENSION=\"\\\"$obj\\\"\""
+GAMBCLIB_DEFS="$GAMBCLIB_DEFS -D___EXE_EXTENSION=\"\\\"$exe\\\"\""
+GAMBCLIB_DEFS="$GAMBCLIB_DEFS -D___BAT_EXTENSION=\"\\\"$bat\\\"\""
###############################################################################
@@ -1979,7 +1979,7 @@ AC_SUBST(HELP_BROWSER)
AC_PROG_MAKE_SET
-AC_OUTPUT(makefile include/makefile include/gambit.h lib/makefile lib/guide/guidepro lib/guide/makefile lib/guide/images/makefile gsi/makefile gsc/makefile bin/makefile bin/gambc-cc.bat.unix bin/gambc-cc.bat.windows bin/gambc-doc.bat.unix bin/gambc-doc.bat.windows misc/makefile doc/makefile tests/makefile examples/makefile examples/distr-comp/makefile examples/pi/makefile examples/ring/makefile examples/web-repl/makefile examples/web-server/makefile examples/tcltk/makefile examples/Xlib-simple/makefile examples/pthread/makefile examples/misc/makefile examples/iOS/makefile prebuilt/makefile prebuilt/macosx/makefile prebuilt/macosx/build-phase2 prebuilt/windows/makefile prebuilt/windows/build-phase2)
+AC_OUTPUT(makefile include/makefile include/gambit.h lib/makefile lib/guide/guidepro lib/guide/makefile lib/guide/images/makefile gsi/makefile gsc/makefile bin/makefile bin/gambc-cc.unix bin/gambc-cc.bat.windows bin/gambc-doc.unix bin/gambc-doc.bat.windows misc/makefile doc/makefile tests/makefile examples/makefile examples/distr-comp/makefile examples/pi/makefile examples/ring/makefile examples/web-repl/makefile examples/web-server/makefile examples/tcltk/makefile examples/Xlib-simple/makefile examples/pthread/makefile examples/misc/makefile examples/iOS/makefile prebuilt/makefile prebuilt/macosx/makefile prebuilt/macosx/build-phase2 prebuilt/windows/makefile prebuilt/windows/build-phase2)
if test "$ENABLE_SINGLE_HOST" != yes; then
AC_MSG_NOTICE([
View
6 gsc/_gsclib.scm
@@ -1,6 +1,6 @@
;;;============================================================================
-;;; File: "_gsclib.scm", Time-stamp: <2009-11-01 21:29:25 feeley>
+;;; File: "_gsclib.scm", Time-stamp: <2011-03-20 21:15:32 feeley>
;;; Copyright (c) 1994-2009 by Marc Feeley, All Rights Reserved.
@@ -304,7 +304,9 @@
status))
open-process
(##list path:
- (##string-append gambcdir-bin "gambc-cc.bat")
+ (##string-append gambcdir-bin
+ "gambc-cc"
+ ##os-bat-extension-string-saved)
arguments:
(##list (##symbol->string op))
directory:
View
4 include/stamp.h
@@ -2,5 +2,5 @@
* Time stamp of last source code repository commit.
*/
-#define ___STAMP_YMD 20110321
-#define ___STAMP_HMS 10611
+#define ___STAMP_YMD 20110324
+#define ___STAMP_HMS 15833
View
7 lib/_kernel.scm
@@ -1,6 +1,6 @@
;;;============================================================================
-;;; File: "_kernel.scm", Time-stamp: <2010-01-07 08:49:37 feeley>
+;;; File: "_kernel.scm", Time-stamp: <2011-03-20 21:10:21 feeley>
;;; Copyright (c) 1994-2010 by Marc Feeley, All Rights Reserved.
@@ -3726,6 +3726,11 @@ end-of-code
nonnull-char-string
"___os_exe_extension_string")))
+(define ##os-bat-extension-string-saved
+ ((c-lambda ()
+ nonnull-char-string
+ "___os_bat_extension_string")))
+
;;;----------------------------------------------------------------------------
;;; Miscellaneous definitions.
View
6 lib/_repl.scm
@@ -1,6 +1,6 @@
;;;============================================================================
-;;; File: "_repl.scm", Time-stamp: <2009-11-27 22:00:44 feeley>
+;;; File: "_repl.scm", Time-stamp: <2011-03-20 21:17:00 feeley>
;;; Copyright (c) 1994-2009 by Marc Feeley, All Rights Reserved.
@@ -3874,7 +3874,9 @@
status))
open-process
(##list path:
- (##string-append gambcdir-bin "gambc-doc.bat")
+ (##string-append gambcdir-bin
+ "gambc-doc"
+ ##os-bat-extension-string-saved)
arguments:
'()
environment:
View
14 lib/os.c
@@ -1,4 +1,4 @@
-/* File: "os.c", Time-stamp: <2009-11-24 19:12:42 feeley> */
+/* File: "os.c", Time-stamp: <2011-03-20 21:09:44 feeley> */
/* Copyright (c) 1994-2009 by Marc Feeley, All Rights Reserved. */
@@ -2124,11 +2124,17 @@ char *___os_configure_command_string ___PVOID
#define ___EXE_EXTENSION ".exe"
#endif
+#ifndef ___BAT_EXTENSION
+#define ___BAT_EXTENSION ".bat"
+#endif
+
___HIDDEN char *os_obj_extension_string = ___OBJ_EXTENSION;
___HIDDEN char *os_exe_extension_string = ___EXE_EXTENSION;
+___HIDDEN char *os_bat_extension_string = ___BAT_EXTENSION;
+
char *___os_obj_extension_string ___PVOID
{
@@ -2142,6 +2148,12 @@ char *___os_exe_extension_string ___PVOID
}
+char *___os_bat_extension_string ___PVOID
+{
+ return os_bat_extension_string;
+}
+
+
/*---------------------------------------------------------------------------*/
View
39 lib/os.h
@@ -1,4 +1,4 @@
-/* File: "os.h", Time-stamp: <2011-03-10 15:52:08 feeley> */
+/* File: "os.h", Time-stamp: <2011-03-22 14:38:44 feeley> */
/* Copyright (c) 1994-2010 by Marc Feeley, All Rights Reserved. */
@@ -206,6 +206,14 @@
#define USE_waitpid
#endif
+#if 0
+
+/*
+ * This code is now commented out as it seems to be causing trouble on
+ * CYGWIN and the problem it was trying to solve no longer seems to
+ * exist (perhaps the bug in CYGWIN has since been repaired).
+ */
+
#ifdef __CYGWIN__
/*
* Cygwin's timer implementation does not support ITIMER_VIRTUAL and
@@ -221,6 +229,8 @@
#endif
+#endif
+
#ifdef USE_WIN32
@@ -1366,6 +1376,32 @@ typedef unsigned int fpu_control_t __attribute__ ((__mode__ (__HI__)));
#endif
#endif
+
+/*
+ * Use the process-time timer unless only the real-time timer is
+ * available (e.g. DJGPP). Note that on some systems (e.g. MkLinux)
+ * ITIMER_VIRTUAL is an enum type, not a macro.
+ */
+
+#ifdef __CYGWIN__
+/* ITIMER_VIRTUAL is broken under cygwin... use ITIMER_REAL */
+#undef ITIMER_VIRTUAL
+#endif
+
+#ifdef ITIMER_VIRTUAL
+#define HEARTBEAT_ITIMER ITIMER_VIRTUAL
+#define HEARTBEAT_SIG SIGVTALRM
+#else
+#ifdef ITIMER_REAL
+#define HEARTBEAT_ITIMER ITIMER_REAL
+#define HEARTBEAT_SIG SIGALRM
+#else
+#define HEARTBEAT_ITIMER ITIMER_VIRTUAL
+#define HEARTBEAT_SIG SIGVTALRM
+#endif
+#endif
+
+
/*---------------------------------------------------------------------------*/
#define ___CHAR_TYPE(ce) \
@@ -1422,6 +1458,7 @@ extern char *___os_configure_command_string ___PVOID;
extern char *___os_obj_extension_string ___PVOID;
extern char *___os_exe_extension_string ___PVOID;
+extern char *___os_bat_extension_string ___PVOID;
/* OS initialization/finalization. */
View
165 lib/os_io.c
@@ -1,4 +1,4 @@
-/* File: "os_io.c", Time-stamp: <2011-03-10 15:55:49 feeley> */
+/* File: "os_io.c", Time-stamp: <2011-03-22 15:01:36 feeley> */
/* Copyright (c) 1994-2010 by Marc Feeley, All Rights Reserved. */
@@ -651,6 +651,60 @@ ___stream_index *len_done;)
#ifdef USE_POSIX
+
+#ifdef USE_sigaction
+typedef sigset_t sigset_type;
+#else
+typedef int sigset_type;
+#endif
+
+
+___HIDDEN sigset_type block_signal
+ ___P((int signum),
+ (signum)
+int signum;)
+{
+ sigset_type oldmask;
+
+#ifdef USE_sigaction
+
+ sigset_type toblock;
+
+ sigemptyset (&toblock);
+ sigaddset (&toblock, signum);
+ sigprocmask (SIG_BLOCK, &toblock, &oldmask);
+
+#endif
+
+#ifdef USE_signal
+
+ oldmask = sigblock (sigmask (signum));
+
+#endif
+
+ return oldmask;
+}
+
+
+___HIDDEN void restore_sigmask
+ ___P((sigset_type oldmask),
+ (oldmask)
+sigset_type oldmask;)
+{
+#ifdef USE_sigaction
+
+ sigprocmask (SIG_SETMASK, &oldmask, 0);
+
+#endif
+
+#ifdef USE_signal
+
+ sigsetmask (oldmask);
+
+#endif
+}
+
+
/*
* Some system calls can be interrupted by a signal and fail with
* errno == EINTR. The following functions are wrappers for system
@@ -942,10 +996,12 @@ ___time timeout;)
*/
result = 0;
+
+ goto select_done;
}
+#ifdef USE_nanosleep
else
{
-#ifdef USE_nanosleep
/*
* For better timeout resolution, the nanosleep function
@@ -961,36 +1017,38 @@ ___time timeout;)
delta_ts_struct.tv_nsec = delta_tv->tv_usec * 1000;
result = nanosleep (&delta_ts_struct, NULL);
-#else
+ goto select_done;
+ }
+#endif
+ }
- /*
- * The select function is only being called to sleep.
- */
+ {
+#ifdef __CYGWIN__
+
+ /*
+ * Cygwin's select can be interrupted by the timer and in some
+ * cases the error "No child processes" will be returned by
+ * select. Consequently the timer signal is blocked from
+ * interrupting select.
+ */
- result =
- select (state.highest_fd_plus_1,
- &state.readfds,
- &state.writefds,
- &state.exceptfds,
- delta_tv);
+ sigset_type old = block_signal (HEARTBEAT_SIG);
#endif
- }
- }
- else
- {
- /*
- * The select function is being called to sleep and/or to
- * block on a set of file descriptors for I/O.
- */
- result =
- select (state.highest_fd_plus_1,
- &state.readfds,
- &state.writefds,
- &state.exceptfds,
- delta_tv);
- }
+ result =
+ select (state.highest_fd_plus_1,
+ &state.readfds,
+ &state.writefds,
+ &state.exceptfds,
+ delta_tv);
+
+#ifdef __CYGWIN__
+ restore_sigmask (old);
+#endif
+ }
+
+ select_done:
if (result < 0)
return err_code_from_errno ();
@@ -6797,59 +6855,6 @@ ___STRING_TYPE(___STREAM_OPEN_PROCESS_CE_SELECT) *env;)
#endif
-#ifdef USE_execvp
-
-#ifdef USE_sigaction
-typedef sigset_t sigset_type;
-#else
-typedef int sigset_type;
-#endif
-
-___HIDDEN sigset_type block_signal
- ___P((int signum),
- (signum)
-int signum;)
-{
- sigset_type oldmask;
-
-#ifdef USE_sigaction
-
- sigset_type toblock;
-
- sigemptyset (&toblock);
- sigaddset (&toblock, signum);
- sigprocmask (SIG_BLOCK, &toblock, &oldmask);
-
-#endif
-
-#ifdef USE_signal
-
- oldmask = sigblock (sigmask (signum));
-
-#endif
-
- return oldmask;
-}
-
-___HIDDEN void restore_sigmask
- ___P((sigset_type oldmask),
- (oldmask)
-sigset_type oldmask;)
-{
-#ifdef USE_sigaction
-
- sigprocmask (SIG_SETMASK, &oldmask, 0);
-
-#endif
-
-#ifdef USE_signal
-
- sigsetmask (oldmask);
-
-#endif
-}
-
-#endif
___SCMOBJ ___device_stream_setup_from_process
___P((___device_stream **dev,
View
27 lib/os_time.c
@@ -1,4 +1,4 @@
-/* File: "os_time.c", Time-stamp: <2009-01-15 09:09:04 feeley> */
+/* File: "os_time.c", Time-stamp: <2011-03-22 14:38:49 feeley> */
/* Copyright (c) 1994-2008 by Marc Feeley, All Rights Reserved. */
@@ -730,31 +730,6 @@ ___HIDDEN void cleanup_process_times ___PVOID
/* Heartbeat interrupt handling. */
-/*
- * Use the process-time timer unless only the real-time timer is
- * available (e.g. DJGPP). Note that on some systems (e.g. MkLinux)
- * ITIMER_VIRTUAL is an enum type, not a macro.
- */
-
-#ifdef __CYGWIN__
-/* ITIMER_VIRTUAL is broken under cygwin... use ITIMER_REAL */
-#undef ITIMER_VIRTUAL
-#endif
-
-#ifdef ITIMER_VIRTUAL
-#define HEARTBEAT_ITIMER ITIMER_VIRTUAL
-#define HEARTBEAT_SIG SIGVTALRM
-#else
-#ifdef ITIMER_REAL
-#define HEARTBEAT_ITIMER ITIMER_REAL
-#define HEARTBEAT_SIG SIGALRM
-#else
-#define HEARTBEAT_ITIMER ITIMER_VIRTUAL
-#define HEARTBEAT_SIG SIGVTALRM
-#endif
-#endif
-
-
#ifndef USE_setitimer
#ifndef USE_dos_setvect_1Ch
#ifndef USE_DosStartTimer

0 comments on commit d4b8889

Please sign in to comment.