diff options
author | Bryan Newbold <bnewbold@robocracy.org> | 2017-02-20 00:05:31 -0800 |
---|---|---|
committer | Bryan Newbold <bnewbold@robocracy.org> | 2017-02-20 00:05:31 -0800 |
commit | ae2b295c7deaf2d7c18ad1ed9b6050970e56bae7 (patch) | |
tree | eee15e02ae016333546d3841712be591b2bcb06f /scm.c | |
parent | 302e3218b7d487539ec305bf23881a6ee7d5be99 (diff) | |
download | scm-ae2b295c7deaf2d7c18ad1ed9b6050970e56bae7.tar.gz scm-ae2b295c7deaf2d7c18ad1ed9b6050970e56bae7.zip |
Import Upstream version 5e2upstream/5e2
Diffstat (limited to 'scm.c')
-rw-r--r-- | scm.c | 20 |
1 files changed, 8 insertions, 12 deletions
@@ -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}}; |