Merge branch 'pre-0.64'

[PuTTY.git] / unix / unix.h

diff --git a/unix/unix.h b/unix/unix.h
index 3af9eebb30ab64448fc712dbf7dfc506cf642886..d43e0ae097a5f273e1b8233eae0b19fdf306bea8 100644 (file)
--- a/unix/unix.h
+++ b/unix/unix.h
@@ -24,9 +24,6 @@ struct FontSpec *fontspec_new(const char *name);
 
 typedef void *Context;                 /* FIXME: probably needs changing */
 
-typedef int OSSocket;
-#define OSSOCKET_DEFINED              /* stop network.h using its default */
-
 extern Backend pty_backend;
 
 typedef uint32_t uint32; /* C99: uint32_t defined in stdint.h */
@@ -156,7 +153,10 @@ void (*putty_signal(int sig, void (*func)(int)))(int);
 void block_signal(int sig, int block_it);
 
 /* uxmisc.c */
-int cloexec(int);
+void cloexec(int);
+void noncloexec(int);
+int nonblock(int);
+int no_nonblock(int);
 
 /*
  * Exports from unicode.c.
@@ -170,13 +170,6 @@ int init_ucs(struct unicode_data *ucsdata, char *line_codepage,
  */
 void *sk_getxdmdata(void *sock, int *lenp);
 
-/*
- * Function provided by front ends, and called by uxnet.c to indicate
- * that net_pending_errors() would like to be called back when the
- * front end has a spare moment and isn't deep in any other recursion.
- */
-void frontend_net_error_pending(void);
-
 /*
  * General helpful Unix stuff: more helpful version of the FD_SET
  * macro, which also handles maxfd.