github.com/Interlisp.maiko
1
0
Fork 0
mirror of https://github.com/Interlisp/maiko.git synced 2026-05-04 07:19:21 +00:00
Code Issues Projects Releases Wiki Activity

Integer variables referenced from a signal handler (XLocked, XNeedSignal) should be type sig_atomic_t

Browse Source
This commit is contained in:
Nick Briggs
2021-07-05 14:19:23 -07:00
parent 934b15b63b
commit 9ed46e6b69
4 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
inc/ldeXdefs.h
View File

@@ -27,9 +27,9 @@
#define XUNLOCK #define XUNLOCK
#endif /* LOCK_X_UPDATES */ #endif /* LOCK_X_UPDATES */
extern int XLocked; #include <signal.h>
extern int XNeedSignal; extern volatile sig_atomic_t XLocked;
/* this is !0 if we're locked; it should be 0 or larger always */ extern volatile sig_atomic_t XNeedSignal;
#endif #endif

4
inc/xdefs.h
View File

@@ -34,9 +34,9 @@
#include <signal.h> #include <signal.h>
#include "xwinmandefs.h" #include "xwinmandefs.h"
extern int XLocked;
extern int XNeedSignal;
/* this is !0 if we're locked; it should be 0 or larger always */ /* this is !0 if we're locked; it should be 0 or larger always */
extern volatile sig_atomic_t XLocked;
extern volatile sig_atomic_t XNeedSignal;
#define XLOCK do { XLocked++; /* printf("L"); fflush(stdout);*/} while (0) #define XLOCK do { XLocked++; /* printf("L"); fflush(stdout);*/} while (0)
#define XUNLOCK(dsp) \ #define XUNLOCK(dsp) \

5
src/keyevent.c
View File

@@ -121,10 +121,11 @@ extern DLword *EmMouseX68K, *EmMouseY68K, *EmKbdAd068K, *EmRealUtilin68K, *EmUti
extern DLword *EmKbdAd168K, *EmKbdAd268K, *EmKbdAd368K, *EmKbdAd468K, *EmKbdAd568K; extern DLword *EmKbdAd168K, *EmKbdAd268K, *EmKbdAd368K, *EmKbdAd468K, *EmKbdAd568K;
extern u_char *SUNLispKeyMap; extern u_char *SUNLispKeyMap;
extern int LispWindowFd; extern int LispWindowFd;
extern int RS232C_Fd, RS232C_remain_data, XLocked; extern int RS232C_Fd, RS232C_remain_data;
extern fd_set LispIOFds; extern fd_set LispIOFds;
fd_set LispReadFds; fd_set LispReadFds;
int XNeedSignal = 0; /* T if an X interrupt happened while XLOCK asserted */ extern volatile sig_atomic_t XLocked;
extern volatile sig_atomic_t XNeedSignal;
extern int LogFileFd; extern int LogFileFd;

4
src/xinit.c
View File

@@ -11,6 +11,7 @@
#include "version.h" #include "version.h"
#include <assert.h> #include <assert.h>
#include <signal.h>
#include <stdbool.h> #include <stdbool.h>
#include <stdio.h> #include <stdio.h>
#include <unistd.h> #include <unistd.h>
@@ -62,7 +63,8 @@ unsigned LispDisplayRequestedWidth, LispDisplayRequestedHeight;
Colormap Colors; Colormap Colors;
int XLocked = 0; /* non-zero while doing X ops, to avoid signals */ volatile sig_atomic_t XLocked = 0; /* non-zero while doing X ops, to avoid signals */
volatile sig_atomic_t XNeedSignal = 0; /* T if an X interrupt happened while XLOCK asserted */
extern fd_set LispReadFds; extern fd_set LispReadFds;
/************************************************************************/ /************************************************************************/