X-Git-Url: https://git.distorted.org.uk/u/mdw/putty/blobdiff_plain/2c2bce14fdc3076f357ac1841761a8717e590d22..63c25c948aeb1e62adf59e7f018feae58742da40:/unix/unix.h diff --git a/unix/unix.h b/unix/unix.h index 0e61faab..faf56008 100644 --- a/unix/unix.h +++ b/unix/unix.h @@ -6,6 +6,10 @@ #endif #include /* for FILENAME_MAX */ +#include /* C99 int types */ +#ifndef NO_LIBDL +#include /* Dynamic library loading */ +#endif /* NO_LIBDL */ #include "charset.h" struct Filename { @@ -24,6 +28,9 @@ typedef int OSSocket; extern Backend pty_backend; +typedef uint32_t uint32; /* C99: uint32_t defined in stdint.h */ +#define PUTTY_UINT32_DEFINED + /* * Under GTK, we send MA_CLICK _and_ MA_2CLK, or MA_CLICK _and_ * MA_3CLK, when a button is pressed for the second or third time. @@ -35,6 +42,7 @@ extern Backend pty_backend; */ #define HELPCTX(x) P(NULL) #define FILTER_KEY_FILES NULL /* FIXME */ +#define FILTER_DYNLIB_FILES NULL /* FIXME */ /* * Under X, selection data must not be NUL-terminated. @@ -60,16 +68,6 @@ extern long tickcount_offset; #define WCHAR wchar_t #define BYTE unsigned char -#ifndef NO_GSSAPI -/* - * GSS-API stuff - */ -#include -typedef gss_buffer_desc Ssh_gss_buf; -#define SSH_GSS_EMPTY_BUF GSS_C_EMPTY_BUFFER -typedef gss_name_t Ssh_gss_name; -#endif - /* * Unix-specific global flag * @@ -91,7 +89,7 @@ long get_windowid(void *frontend); 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 do_config_box(const char *title, Conf *conf, int midsession, int protcfginfo); void fatal_message_box(void *window, char *msg); void about_box(void *window); @@ -102,7 +100,7 @@ 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 *allow_launch); +int process_nonoption_arg(char *arg, Conf *conf, int *allow_launch); /* pterm.c needs this special function in xkeysym.c */ int keysym_to_unicode(int keysym);