summary refs log tree commit diff stats
path: root/src/common/xchat.h
diff options
context:
space:
mode:
authorberkeviktor@aol.com <berkeviktor@aol.com>2011-02-28 18:59:32 +0100
committerberkeviktor@aol.com <berkeviktor@aol.com>2011-02-28 18:59:32 +0100
commitd03d6e606b40157d910ddf99ab018156abeb8ef0 (patch)
tree1f2b148661fb688ae0863b361e49f19672dbe685 /src/common/xchat.h
parentad7ea4b77e059880ef8f7cb05fe2aa2cdcc217fb (diff)
add wdk changes to named branch
Diffstat (limited to 'src/common/xchat.h')
-rw-r--r--src/common/xchat.h12
1 files changed, 10 insertions, 2 deletions
diff --git a/src/common/xchat.h b/src/common/xchat.h
index db7a6c4b..2f695599 100644
--- a/src/common/xchat.h
+++ b/src/common/xchat.h
@@ -12,12 +12,14 @@
 
 #include "history.h"
 
+#ifndef ENABLE_NLS
 #ifndef HAVE_SNPRINTF
 #define snprintf g_snprintf
 #endif
 
 #ifndef HAVE_VSNPRINTF
-#define vsnprintf g_vsnprintf
+#define vsnprintf _vsnprintf
+#endif
 #endif
 
 #ifdef USE_DEBUG
@@ -58,7 +60,7 @@ void *xchat_realloc (char *old, int len, char *file, int line);
 
 #ifdef WIN32						/* for win32 */
 #define OFLAGS O_BINARY
-#define sleep(t) _sleep(t*1000)
+#define sleep(t) Sleep(t*1000)
 #include <direct.h>
 #define	F_OK	0
 #define	X_OK	1
@@ -209,6 +211,9 @@ struct xchatprefs
 	unsigned int wallops;
 	unsigned int skipmotd;
 	unsigned int autorejoin;
+	unsigned int autocopy_text;
+	unsigned int autocopy_stamp;
+	unsigned int autocopy_color;
 	unsigned int colorednicks;
 	unsigned int chanmodebuttons;
 	unsigned int userlistbuttons;
@@ -297,6 +302,9 @@ struct xchatprefs
 	unsigned int confmode;
 	unsigned int utf8_locale;
 	unsigned int identd;
+	unsigned int emoticons;
+	unsigned int tab_icons;
+	unsigned int tab_xp;
 
 	unsigned int ctcp_number_limit;	/*flood */
 	unsigned int ctcp_time_limit;	/*seconds of floods */