summaryrefslogtreecommitdiffstats
path: root/scm.c
diff options
context:
space:
mode:
authorThomas Bushnell <tb@debian.org>2006-04-26 23:01:39 -0700
committerBryan Newbold <bnewbold@robocracy.org>2017-02-20 00:05:32 -0800
commit20402610bf881f67b22eb1600340d8284556ae56 (patch)
tree6a19e5a1b2cc22dccd1003787a70b751f7da4763 /scm.c
parent5846f77421a975897a31d6fbf3f520aab385cea3 (diff)
parentae2b295c7deaf2d7c18ad1ed9b6050970e56bae7 (diff)
downloadscm-20402610bf881f67b22eb1600340d8284556ae56.tar.gz
scm-20402610bf881f67b22eb1600340d8284556ae56.zip
Import Debian changes 5e2-1debian/5e2-1
scm (5e2-1) unstable; urgency=low * New upstream release. * Change to continue.h from version 5e1-2 repeated here.
Diffstat (limited to 'scm.c')
-rw-r--r--scm.c20
1 files changed, 8 insertions, 12 deletions
diff --git a/scm.c b/scm.c
index d4506e8..bdb7967 100644
--- a/scm.c
+++ b/scm.c
@@ -236,11 +236,11 @@ SIGRETTYPE win32_sigint(int sig)
CONTEXT ctx;
DWORD *Stack;
- if(-1 == SuspendThread(scm_hMainThread))
+ if (-1 == SuspendThread(scm_hMainThread))
return;
ctx.ContextFlags = CONTEXT_FULL;
- if(0 == GetThreadContext(scm_hMainThread, &ctx))
+ if (0 == GetThreadContext(scm_hMainThread, &ctx))
{
ResumeThread(scm_hMainThread);
return;
@@ -289,7 +289,7 @@ static SIGRETTYPE scmable_signal(sig)
if (sig == sigdesc[i].signo) break;
ASRTER(i >= 0, MAKINUM(sig), s_unksig, "");
#ifdef WINSIGNALS
- if(SIGINT == sig)
+ if (SIGINT == sig)
signal(sig, win32_sigint);
else
#endif
@@ -385,13 +385,11 @@ SCM scm_setitimer(which, value, interval)
}
# endif
# ifndef AMIGA
-# ifndef __CYGWIN32__
SCM l_pause()
{
pause();
return UNSPECIFIED;
}
-# endif
# endif
#endif /* SIGALRM */
@@ -680,14 +678,14 @@ void restore_signals()
void scm_init_from_argv(argc, argv, script_arg, iverbose, buf0stdin)
int argc;
- char **argv;
+ const char * const *argv;
char *script_arg;
int iverbose;
int buf0stdin;
{
long i = 0L;
if ((2 <= argc) && argv[1] && (0==strncmp("-a", argv[1], 2))) {
- char *str = (0==argv[1][2] && 3 <= argc && argv[2]) ?argv[2]:&argv[1][2];
+ const char *str = (0==argv[1][2] && 3 <= argc && argv[2]) ?argv[2]:&argv[1][2];
do {
switch (*str) {
case DIGITS:
@@ -731,7 +729,7 @@ void final_scm(freeall)
# define SYSTNAME "unix"
# define DIRSEP "/"
#endif
-#ifdef __CYGWIN32__
+#ifdef __CYGWIN__
# define SYSTNAME "unix"
# define DIRSEP "/"
#endif
@@ -885,8 +883,8 @@ SCM scm_execpath(newpath)
}
char *scm_find_execpath(argc, argv, script_arg)
int argc;
- char **argv;
- char *script_arg;
+ const char * const *argv;
+ const char *script_arg;
{
char *exepath = 0;
#ifndef macintosh
@@ -985,9 +983,7 @@ static iproc subr0s[] = {
#endif
#ifdef SIGALRM
# ifndef AMIGA
-# ifndef __CYGWIN32__
{"pause", l_pause},
-# endif
# endif
#endif
{0, 0}};