X-Git-Url: https://git.distorted.org.uk/u/mdw/putty/blobdiff_plain/1709795fee167cc2d2d423df0161e7963376b910..6f1e7b78af0f9c4c502609392f62771cf2528d8f:/misc.h diff --git a/misc.h b/misc.h index e4e70b1f..21540a3b 100644 --- a/misc.h +++ b/misc.h @@ -3,6 +3,8 @@ #include "puttymem.h" +#include /* for va_list */ + #ifndef FALSE #define FALSE 0 #endif @@ -10,8 +12,10 @@ #define TRUE 1 #endif -char *dupstr(char *s); -char *dupcat(char *s1, ...); +char *dupstr(const char *s); +char *dupcat(const char *s1, ...); +char *dupprintf(const char *fmt, ...); +char *dupvprintf(const char *fmt, va_list ap); void base64_encode_atom(unsigned char *data, int n, char *out); @@ -62,7 +66,7 @@ void debug_memdump(void *buf, int len, int L); #define min(x,y) ( (x) < (y) ? (x) : (y) ) #endif #ifndef max -#define max(x,y) ( (x) < (y) ? (x) : (y) ) +#define max(x,y) ( (x) > (y) ? (x) : (y) ) #endif #endif