Yet more global-removal. The static variables in logging.c are now

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

diff --git a/unix/unix.h b/unix/unix.h
index e175425..7b0bb4b 100644 (file)
--- a/unix/unix.h
+++ b/unix/unix.h
@@ -30,20 +30,16 @@ unsigned long getticks(void);              /* based on gettimeofday(2) */
 #define WCHAR wchar_t
 #define BYTE unsigned char
 
-int is_dbcs_leadbyte(int codepage, char byte);
-int mb_to_wc(int codepage, int flags, char *mbstr, int mblen,
-            wchar_t *wcstr, int wclen);
-int wc_to_mb(int codepage, int flags, wchar_t *wcstr, int wclen,
-            char *mbstr, int mblen, char *defchr, int *defused);
-void init_ucs(void);
-
 /* Things pty.c needs from pterm.c */
-char *get_x_display(void);
-int font_dimension(int which);        /* 0 for width, 1 for height */
+char *get_x_display(void *frontend);
+int font_dimension(void *frontend, int which);/* 0 for width, 1 for height */
 
 /* Things uxstore.c needs from pterm.c */
 char *app_name;                               /* for doing resource lookups */
 
+/* Things uxstore.c provides to pterm.c */
+void provide_xrm_string(char *string);
+
 #define DEFAULT_CODEPAGE 0            /* FIXME: no idea how to do this */
 
 #endif