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

fixes to compile on MSVC again

This commit is contained in:
Doug MacEachern 2011-04-11 15:04:14 -07:00
parent 7041d070f1
commit 240649b925
2 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/os/win32/sigar_os.h
View File

@ -19,9 +19,18 @@
#ifndef SIGAR_OS_H #ifndef SIGAR_OS_H
#define SIGAR_OS_H #define SIGAR_OS_H
#if !defined(MSVC) && defined(_MSC_VER)
#define MSVC
#endif
#ifdef MSVC #ifdef MSVC
#define WIN32_LEAN_AND_MEAN
#define snprintf _snprintf
#if _MSC_VER <= 1200 #if _MSC_VER <= 1200
#define SIGAR_USING_MSC6 /* Visual Studio version 6 */ #define SIGAR_USING_MSC6 /* Visual Studio version 6 */
#define HAVE_MIB_IPADDRROW_WTYPE 0
#else
#define HAVE_MIB_IPADDRROW_WTYPE 1
#endif #endif
#else #else
/* Cross compiling */ /* Cross compiling */

2
src/os/win32/win32_sigar.c
View File

@ -23,7 +23,9 @@
#include "sigar_util.h" #include "sigar_util.h"
#include "sigar_format.h" #include "sigar_format.h"
#include <shellapi.h> #include <shellapi.h>
#ifndef MSVC
#include <iphlpapi.h> #include <iphlpapi.h>
#endif
#define USING_WIDE_S(s) (s)->using_wide #define USING_WIDE_S(s) (s)->using_wide
#define USING_WIDE() USING_WIDE_S(sigar) #define USING_WIDE() USING_WIDE_S(sigar)