Changeset - f2d21db482c7
[Not reviewed]
Merge
0 16 11
Vitaly Takmazov - 13 years ago 2012-03-06 11:29:30
vitalyster@gmail.com
Merge branch 'master' of https://github.com/hanzz/libtransport
2 files changed with 2 insertions and 2 deletions:
0 comments (0 inline, 0 general)
plugin/src/networkplugin.cpp
Show inline comments
 
@@ -25,9 +25,9 @@
 

	
 
#ifndef WIN32
 
#include <arpa/inet.h>
 
#define uint32_t u_long
 
#else 
 
#include <winsock2.h>
 
#include <stdint.h>
 
#endif
 

	
 
using namespace log4cxx;
src/networkpluginserver.cpp
Show inline comments
 
@@ -48,7 +48,7 @@
 

	
 
#ifdef _WIN32
 
#include "windows.h"
 
#define uint32_t u_long
 
#include <stdint.h>
 
#else
 
#include "sys/wait.h"
 
#include "sys/signal.h"
0 comments (0 inline, 0 general)