projects
/
u
/
mdw
/
putty
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Set FD_CLOEXEC in a little convenience function that does the right thing
[u/mdw/putty]
/
unix
/
unix.h
diff --git
a/unix/unix.h
b/unix/unix.h
index
969cdbb
..
fd206a9
100644
(file)
--- a/
unix/unix.h
+++ b/
unix/unix.h
@@
-1,6
+1,10
@@
#ifndef PUTTY_UNIX_H
#define PUTTY_UNIX_H
#ifndef PUTTY_UNIX_H
#define PUTTY_UNIX_H
+#ifdef HAVE_CONFIG_H
+# include "uxconfig.h" /* Space to hide it from mkfiles.pl */
+#endif
+
#include <stdio.h> /* for FILENAME_MAX */
#include "charset.h"
#include <stdio.h> /* for FILENAME_MAX */
#include "charset.h"
@@
-47,6
+51,11
@@
unsigned long getticks(void); /* based on gettimeofday(2) */
#define GETTICKCOUNT getticks
#define TICKSPERSEC 1000 /* we choose to use milliseconds */
#define CURSORBLINK 450 /* no standard way to set this */
#define GETTICKCOUNT getticks
#define TICKSPERSEC 1000 /* we choose to use milliseconds */
#define CURSORBLINK 450 /* no standard way to set this */
+/* getticks() works using gettimeofday(), so it's vulnerable to system clock
+ * changes causing chaos. Therefore, we provide a compensation mechanism. */
+#define TIMING_SYNC
+#define TIMING_SYNC_ANOW
+extern long tickcount_offset;
#define WCHAR wchar_t
#define BYTE unsigned char
#define WCHAR wchar_t
#define BYTE unsigned char
@@
-60,7
+69,8
@@
long get_windowid(void *frontend);
void *get_window(void *frontend); /* void * to avoid depending on gtk.h */
/* Things pterm.c needs from gtkdlg.c */
void *get_window(void *frontend); /* void * to avoid depending on gtk.h */
/* Things pterm.c needs from gtkdlg.c */
-int do_config_box(const char *title, Config *cfg, int midsession);
+int do_config_box(const char *title, Config *cfg,
+ int midsession, int protcfginfo);
void fatal_message_box(void *window, char *msg);
void about_box(void *window);
void *eventlogstuff_new(void);
void fatal_message_box(void *window, char *msg);
void about_box(void *window);
void *eventlogstuff_new(void);
@@
-95,7
+105,10
@@
void uxsel_input_remove(int id);
/* uxcfg.c */
struct controlbox;
/* uxcfg.c */
struct controlbox;
-void unix_setup_config_box(struct controlbox *b, int midsession, void *window);
+void unix_setup_config_box(struct controlbox *b, int midsession, int protocol);
+
+/* gtkcfg.c */
+void gtk_setup_config_box(struct controlbox *b, int midsession, void *window);
/*
* In the Unix Unicode layer, DEFAULT_CODEPAGE is a special value
/*
* In the Unix Unicode layer, DEFAULT_CODEPAGE is a special value
@@
-115,6
+128,9
@@
void unix_setup_config_box(struct controlbox *b, int midsession, void *window);
void (*putty_signal(int sig, void (*func)(int)))(int);
void block_signal(int sig, int block_it);
void (*putty_signal(int sig, void (*func)(int)))(int);
void block_signal(int sig, int block_it);
+/* uxmisc.c */
+int cloexec(int);
+
/*
* Exports from unicode.c.
*/
/*
* Exports from unicode.c.
*/
@@
-125,7
+141,7
@@
int init_ucs(struct unicode_data *ucsdata, char *line_codepage,
/*
* Spare function exported directly from uxnet.c.
*/
/*
* Spare function exported directly from uxnet.c.
*/
-
int sk_getxdmdata(void *sock, unsigned long *ip, int *port
);
+
void *sk_getxdmdata(void *sock, int *lenp
);
/*
* General helpful Unix stuff: more helpful version of the FD_SET
/*
* General helpful Unix stuff: more helpful version of the FD_SET
@@
-136,4
+152,9
@@
int sk_getxdmdata(void *sock, unsigned long *ip, int *port);
if (max < fd + 1) max = fd + 1; \
} while (0)
if (max < fd + 1) max = fd + 1; \
} while (0)
+/*
+ * Exports from winser.c.
+ */
+extern Backend serial_backend;
+
#endif
#endif