bughz
/
sigar
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'sigar-1.6'

This commit is contained in:
Doug MacEachern 2009-07-07 15:31:07 -07:00
parent 9769d17c3d e9e3dce323
commit 930de473be
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/sigar.c
View File

@ -20,13 +20,16 @@
#include <stdio.h> #include <stdio.h>
#ifndef WIN32 #ifndef WIN32
#include <arpa/inet.h> #include <sys/types.h>
#include <sys/socket.h> #include <sys/socket.h>
#include <sys/time.h> #include <sys/time.h>
#endif #endif
#if defined(__OpenBSD__) || defined(__FreeBSD__) #if defined(__OpenBSD__) || defined(__FreeBSD__)
#include <netinet/in.h> #include <netinet/in.h>
#endif #endif
#ifndef WIN32
#include <arpa/inet.h>
#endif
#include "sigar.h" #include "sigar.h"
#include "sigar_private.h" #include "sigar_private.h"

6
src/sigar_format.c
View File

@ -28,6 +28,7 @@
#include <stdio.h> #include <stdio.h>
#ifndef WIN32 #ifndef WIN32
#include <netinet/in.h>
#include <arpa/inet.h> #include <arpa/inet.h>
#if defined(__OpenBSD__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(_AIX) #if defined(__OpenBSD__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(_AIX)
#include <sys/socket.h> #include <sys/socket.h>
@ -292,11 +293,6 @@ SIGAR_DECLARE(int) sigar_uptime_string(sigar_t *sigar,
return SIGAR_OK; return SIGAR_OK;
} }
#ifndef WIN32
#include <netinet/in.h>
#endif
/* threadsafe alternative to inet_ntoa (inet_ntop4 from apr) */ /* threadsafe alternative to inet_ntoa (inet_ntop4 from apr) */
int sigar_inet_ntoa(sigar_t *sigar, int sigar_inet_ntoa(sigar_t *sigar,
sigar_uint32_t address, sigar_uint32_t address,