Fix segfaults in terminal resizing, introduced by re-engineering.

[u/mdw/putty] / unix / unix.h

diff --git a/unix/unix.h b/unix/unix.h
index dbb28d6..f12f576 100644 (file)
--- a/unix/unix.h
+++ b/unix/unix.h
@@ -51,8 +51,6 @@ unsigned long getticks(void);        /* based on gettimeofday(2) */
 #define WCHAR wchar_t
 #define BYTE unsigned char
 
-GLOBAL void *logctx;
-
 /* Things pty.c needs from pterm.c */
 char *get_x_display(void *frontend);
 int font_dimension(void *frontend, int which);/* 0 for width, 1 for height */
@@ -128,4 +126,13 @@ int init_ucs(struct unicode_data *ucsdata,
  */
 int sk_getxdmdata(void *sock, unsigned long *ip, int *port);
 
+/*
+ * General helpful Unix stuff: more helpful version of the FD_SET
+ * macro, which also handles maxfd.
+ */
+#define FD_SET_MAX(fd, max, set) do { \
+    FD_SET(fd, &set); \
+    if (max < fd + 1) max = fd + 1; \
+} while (0)
+
 #endif