Fixed some msvc problems with libircclient. Fixed auto start boost timer issue. Fixed irc thread termination (this time for real). Using strdup and free on MSVC causes "heap corruption error" in debug mode - use _strdup instead in libircclient.
This commit is contained in:
1 parent
c33bf3a3d6
commit
5edf38a6cb
15 files changed
+69
-14
No files matched your search
@@ -13,6 +13,7 @@
|
||||
// Speeds up compilation a bit on msvc
|
||||
#if (defined _MSC_VER) && (_MSC_VER >= 1200)
|
||||
#pragma once
|
||||
#define _WINSOCKAPI_
|
||||
#endif
|
||||
|
||||
#include <boost/config.hpp>
|
||||
|
||||
@@ -49,7 +49,7 @@
|
||||
#include <sys/select.h> /* fd_set */
|
||||
#include <netinet/in.h> /* sockaddr_in */
|
||||
#else
|
||||
#include <winsock.h>
|
||||
#include <winsock2.h>
|
||||
#endif
|
||||
|
||||
#ifdef __cplusplus
|
||||
|
||||
@@ -14,6 +14,7 @@
|
||||
* $Id: libircclient.c 42 2004-10-10 16:16:15Z gyunaev $
|
||||
*/
|
||||
|
||||
|
||||
#include "portable.c"
|
||||
#include "sockets.c"
|
||||
|
||||
@@ -25,6 +26,11 @@
|
||||
#include "colors.c"
|
||||
#include "dcc.c"
|
||||
|
||||
#ifdef _MSC_VER
|
||||
#undef strdup
|
||||
#define strdup _strdup
|
||||
#endif
|
||||
|
||||
#define IS_DEBUG_ENABLED(s) ((s)->option & LIBIRC_OPTION_DEBUG)
|
||||
|
||||
|
||||
|
||||
@@ -42,8 +42,8 @@
|
||||
#endif
|
||||
#endif
|
||||
#else
|
||||
#include <winsock2.h>
|
||||
#include <windows.h>
|
||||
#include <winsock.h>
|
||||
#include <time.h>
|
||||
#include <stdio.h>
|
||||
#include <stdarg.h>
|
||||
|
||||
Reference in new issue
Block a user