diff options
| author | ulim <a.sporto+bee@gmail.com> | 2008-08-04 16:45:24 +0200 |
|---|---|---|
| committer | ulim <a.sporto+bee@gmail.com> | 2008-08-04 16:45:24 +0200 |
| commit | 8661caad555f4306cf36ee37979a7637b05d5cd4 (patch) | |
| tree | 7e4a7c3d6a700610dd31d109508b07caa3253902 /bitlbee.h | |
| parent | 4ac647dbcef152bebde7209f7c9cbbf8a5e0fc37 (diff) | |
| parent | 718e05f842c1af043eb4efded8b0afe429377f70 (diff) | |
merged in upstream r410.
Only conflict was the correction of jabber normalization which I had already done.
Diffstat (limited to 'bitlbee.h')
| -rw-r--r-- | bitlbee.h | 12 |
1 files changed, 6 insertions, 6 deletions
@@ -28,8 +28,11 @@ #define _GNU_SOURCE /* Stupid GNU :-P */ +/* Depend on Windows 2000 for now since we need getaddrinfo() */ +#define _WIN32_WINNT 0x0501 + #define PACKAGE "BitlBee" -#define BITLBEE_VERSION "1.2" +#define BITLBEE_VERSION "1.2.1" #define VERSION BITLBEE_VERSION #define MAX_STRING 511 @@ -47,9 +50,10 @@ #include <stdarg.h> #include <stdio.h> #include <ctype.h> +#include <errno.h> + #ifndef _WIN32 #include <syslog.h> -#include <errno.h> #endif #include <glib.h> @@ -94,10 +98,6 @@ #undef g_main_quit #define g_main_quit __PLEASE_USE_B_MAIN_QUIT__ -#ifndef F_OK -#define F_OK 0 -#endif - #ifndef G_GNUC_MALLOC /* Doesn't exist in GLib <=2.4 while everything else in BitlBee should work with it, so let's fake this one. */ |