Created new data types `Filename' and `FontSpec', intended to be

[u/mdw/putty] / winstuff.h

diff --git a/winstuff.h b/winstuff.h
index e2d700e..1cbe5b7 100644 (file)
--- a/winstuff.h
+++ b/winstuff.h
@@ -5,6 +5,20 @@
 #ifndef PUTTY_WINSTUFF_H
 #define PUTTY_WINSTUFF_H
 
+#include <stdio.h>                    /* for FILENAME_MAX */
+
+struct Filename {
+    char path[FILENAME_MAX];
+};
+#define f_open(filename, mode) ( fopen((filename).path, (mode)) )
+
+struct FontSpec {
+    char name[64];
+    int isbold;
+    int height;
+    int charset;
+};
+
 /*
  * Global variables. Most modules declare these `extern', but
  * window.c will do `#define PUTTY_DO_GLOBALS' before including this
@@ -89,6 +103,15 @@ GLOBAL void *logctx;
 #define SEL_NL { 13, 10 }
 
 /*
+ * sk_getxdmdata() does not exist under Windows (not that I
+ * couldn't write it if I wanted to, but I haven't bothered), so
+ * it's a macro which always returns FALSE. With any luck this will
+ * cause the compiler to notice it can optimise away the
+ * implementation of XDM-AUTHORIZATION-1 in x11fwd.c :-)
+ */
+#define sk_getxdmdata(socket, ip, port) (0)
+
+/*
  * Exports from winctrls.c.
  */
 
@@ -192,6 +215,7 @@ void EnableSizeTip(int bEnable);
 /*
  * Exports from unicode.c.
  */
-void init_ucs(void);
+struct unicode_data;
+void init_ucs(Config *, struct unicode_data *);
 
 #endif