Changeset - e6014911424e
[Not reviewed]
Merge
0 16 11
Vitaly Takmazov - 13 years ago 2012-03-20 21:53:21
vitalyster@gmail.com
Merge branch 'master' of https://github.com/hanzz/libtransport
3 files changed with 9 insertions and 0 deletions:
0 comments (0 inline, 0 general)
backends/libpurple/main.cpp
Show inline comments
 
@@ -24,6 +24,11 @@
 
#include <event.h>
 
#endif
 

	
 
#ifdef WIN32
 
#include <process.h>
 
#define getpid _getpid
 
#endif
 

	
 
using namespace log4cxx;
 

	
 
static LoggerPtr logger_libpurple = log4cxx::Logger::getLogger("libpurple");
plugin/cpp/networkplugin.cpp
Show inline comments
 
@@ -28,6 +28,8 @@
 
#else 
 
#include <winsock2.h>
 
#include <stdint.h>
 
#include <process.h>
 
#define getpid _getpid
 
#endif
 

	
 
using namespace log4cxx;
src/logging.cpp
Show inline comments
 
@@ -43,6 +43,8 @@
 
#include "libgen.h"
 
#else
 
#include <windows.h>
 
#include <process.h>
 
#define getpid _getpid
 
#endif
 

	
 
using namespace boost::filesystem;
0 comments (0 inline, 0 general)