\n and \r need double backslashes in Halibut.

[sgt/putty] / unix / unix.h

diff --git a/unix/unix.h b/unix/unix.h
index dbb28d6..90c6ec2 100644 (file)
--- a/unix/unix.h
+++ b/unix/unix.h
@@ -45,14 +45,12 @@ extern Backend pty_backend;
 /* Simple wraparound timer function */
 unsigned long getticks(void);         /* based on gettimeofday(2) */
 #define GETTICKCOUNT getticks
-#define TICKSPERSEC 1000000           /* gettimeofday returns microseconds */
-#define CURSORBLINK  450000           /* no standard way to set this */
+#define TICKSPERSEC    1000           /* we choose to use milliseconds */
+#define CURSORBLINK     450           /* no standard way to set this */
 
 #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 */
@@ -120,12 +118,21 @@ void (*putty_signal(int sig, void (*func)(int)))(int);
  * Exports from unicode.c.
  */
 struct unicode_data;
-int init_ucs(struct unicode_data *ucsdata,
-            char *line_codepage, int font_charset, int vtmode);
+int init_ucs(struct unicode_data *ucsdata, char *line_codepage,
+            int utf8_override, int font_charset, int vtmode);
 
 /*
  * Spare function exported directly from uxnet.c.
  */
 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