From e44f7a857f922d5999d2a9778d3d9600046692f5 Mon Sep 17 00:00:00 2001 From: Doug MacEachern Date: Thu, 18 Aug 2005 04:22:53 +0000 Subject: [PATCH] compile on NETWARE --- src/sigar.c | 13 +++++++++++-- src/sigar_fileinfo.c | 4 +++- src/sigar_util.c | 2 +- 3 files changed, 15 insertions(+), 4 deletions(-) diff --git a/src/sigar.c b/src/sigar.c index 030e689e..87ba1c68 100644 --- a/src/sigar.c +++ b/src/sigar.c @@ -766,6 +766,8 @@ struct utmp { char ut_host[UT_HOSTSIZE]; long ut_addr; }; +#elif defined(NETWARE) +/*XXX*/ #else # include # ifdef UTMP_FILE @@ -779,6 +781,8 @@ struct utmp { # define ut_user ut_name #endif +#ifndef NETWARE + #define WHOCPY(dest, src) \ SIGAR_SSTRCPY(dest, src); \ if (sizeof(src) < sizeof(dest)) \ @@ -825,7 +829,9 @@ static int sigar_who_utmp(sigar_t *sigar, return SIGAR_OK; } -#ifdef WIN32 +#endif /* NETWARE */ + +#if defined(WIN32) #include @@ -1032,6 +1038,9 @@ SIGAR_DECLARE(int) sigar_resource_limit_get(sigar_t *sigar, return SIGAR_OK; } + +#elif defined(NETWARE) +/*XXX*/ #else int sigar_who_list_get(sigar_t *sigar, @@ -1228,7 +1237,7 @@ void sigar_hwaddr_format(char *buff, unsigned char *ptr) (ptr[3] & 0377), (ptr[4] & 0377), (ptr[5] & 0377)); } -#if !defined(WIN32) && !defined(DARWIN) && !defined(__FreeBSD__) +#if !defined(WIN32) && !defined(DARWIN) && !defined(__FreeBSD__) && !defined(NETWARE) /* XXX: prolly will be moving these stuffs into os_net.c */ #include diff --git a/src/sigar_fileinfo.c b/src/sigar_fileinfo.c index bd57194e..5178b1b5 100644 --- a/src/sigar_fileinfo.c +++ b/src/sigar_fileinfo.c @@ -142,7 +142,9 @@ SIGAR_DECLARE(int)sigar_file_attrs_mode_get(sigar_uint64_t permissions) #define IS_DOTDIR(dir) \ ((dir[0] == '.') && (!dir[1] || ((dir[1] == '.') && !dir[2]))) -#ifdef WIN32 +#if defined(NETWARE) + +#elif defined(WIN32) #include #include diff --git a/src/sigar_util.c b/src/sigar_util.c index 69fb28fe..f21e5740 100644 --- a/src/sigar_util.c +++ b/src/sigar_util.c @@ -406,7 +406,7 @@ void sigar_cpu_model_adjust(sigar_t *sigar, sigar_cpu_info_t *info) strcpy(info->model, ptr); } -#ifndef WIN32 +#if !defined(WIN32) && !defined(NETWARE) #include #include #include