diff options
| author | berkeviktor@aol.com <berkeviktor@aol.com> | 2011-07-27 09:07:09 +0200 |
|---|---|---|
| committer | berkeviktor@aol.com <berkeviktor@aol.com> | 2011-07-27 09:07:09 +0200 |
| commit | a11d1857f1f242199ea330e1679cf55e2771395b (patch) | |
| tree | c57bdc180418073e25724d93d87491c3fa9c2e45 /src/common/xchat.h | |
| parent | f39d21328603673ee83c55a5d6d55b276cc8bdb8 (diff) | |
| parent | 69ba67b2549b6c6a46abd19879b67e1545c9ae3b (diff) | |
Merge with default
Diffstat (limited to 'src/common/xchat.h')
| -rw-r--r-- | src/common/xchat.h | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/src/common/xchat.h b/src/common/xchat.h index db7a6c4b..718e0e91 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 @@ -119,6 +121,7 @@ struct xchatprefs char partreason[256]; char font_normal[FONTNAMELEN + 1]; char doubleclickuser[256]; + char gui_license[64]; char sounddir[PATHLEN + 1]; char soundcmd[PATHLEN + 1]; char background[PATHLEN + 1]; @@ -209,6 +212,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 +303,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 */ |