projects
/
u
/
mdw
/
putty
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Martin Prikryl points out that need_pw may be used uninitialised.
[u/mdw/putty]
/
unix
/
unix.h
diff --git
a/unix/unix.h
b/unix/unix.h
index
843655e
..
f12f576
100644
(file)
--- a/
unix/unix.h
+++ b/
unix/unix.h
@@
-15,6
+15,9
@@
struct FontSpec {
typedef void *Context; /* FIXME: probably needs changing */
typedef void *Context; /* FIXME: probably needs changing */
+typedef int OSSocket;
+#define OSSOCKET_DEFINED /* stop network.h using its default */
+
extern Backend pty_backend;
/*
extern Backend pty_backend;
/*
@@
-48,8
+51,6
@@
unsigned long getticks(void); /* based on gettimeofday(2) */
#define WCHAR wchar_t
#define BYTE unsigned char
#define WCHAR wchar_t
#define BYTE unsigned char
-GLOBAL void *logctx;
-
/* Things pty.c needs from pterm.c */
char *get_x_display(void *frontend);
int font_dimension(void *frontend, int which);/* 0 for width, 1 for height */
/* Things pty.c needs from pterm.c */
char *get_x_display(void *frontend);
int font_dimension(void *frontend, int which);/* 0 for width, 1 for height */
@@
-64,13
+65,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 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, c
onst c
har *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);
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);
/* Things uxstore.c needs from pterm.c */
char *x_get_default(const char *key);
@@
-122,4
+126,13
@@
int init_ucs(struct unicode_data *ucsdata,
*/
int sk_getxdmdata(void *sock, unsigned long *ip, int *port);
*/
int sk_getxdmdata(void *sock, unsigned long *ip, int *port);
+/*
+ * General helpful Unix stuff: more helpful version of the FD_SET
+ * macro, which also handles maxfd.
+ */
+#define FD_SET_MAX(fd, max, set) do { \
+ FD_SET(fd, &set); \
+ if (max < fd + 1) max = fd + 1; \
+} while (0)
+
#endif
#endif