X-Git-Url: https://git.distorted.org.uk/u/mdw/putty/blobdiff_plain/abb6895f8e13fb0fda3b6567a2b36b590ea7bfda..58dcb876268d7df73384b5b257ae3bcda416cdfa:/unix/unix.h?ds=sidebyside

diff --git a/unix/unix.h b/unix/unix.h
index bb35a116..dbb28d6f 100644
--- a/unix/unix.h
+++ b/unix/unix.h
@@ -15,6 +15,9 @@ struct FontSpec {
 
 typedef void *Context;                 /* FIXME: probably needs changing */
 
+typedef int OSSocket;
+#define OSSOCKET_DEFINED	       /* stop network.h using its default */
+
 extern Backend pty_backend;
 
 /*
@@ -64,13 +67,16 @@ void fatal_message_box(void *window, char *msg);
 void about_box(void *window);
 void *eventlogstuff_new(void);
 void showeventlog(void *estuff, void *parentwin);
-void logevent_dlg(void *estuff, char *string);
+void logevent_dlg(void *estuff, const char *string);
 int reallyclose(void *frontend);
 
 /* Things pterm.c needs from {ptermm,uxputty}.c */
 char *make_default_wintitle(char *hostname);
 int process_nonoption_arg(char *arg, Config *cfg);
 
+/* pterm.c needs this special function in xkeysym.c */
+int keysym_to_unicode(int keysym);
+
 /* Things uxstore.c needs from pterm.c */
 char *x_get_default(const char *key);
 
@@ -115,7 +121,7 @@ void (*putty_signal(int sig, void (*func)(int)))(int);
  */
 struct unicode_data;
 int init_ucs(struct unicode_data *ucsdata,
-	     char *line_codepage, int font_charset);
+	     char *line_codepage, int font_charset, int vtmode);
 
 /*
  * Spare function exported directly from uxnet.c.