$NetBSD: patch-ab,v 1.12 2008/08/15 17:25:32 tron Exp $ --- src/common/util.c.orig 2008-02-24 02:59:48.000000000 +0000 +++ src/common/util.c 2008-08-15 11:16:47.000000000 +0100 @@ -49,6 +49,10 @@ #if defined (USING_FREEBSD) || defined (__APPLE__) #include +#elif defined(__NetBSD__) +#define session NetBSD_session +#include +#undef session #endif #ifdef SOCKS #include @@ -510,7 +514,7 @@ return len; } -#if defined (USING_LINUX) || defined (USING_FREEBSD) || defined (__APPLE__) +#if defined (USING_LINUX) || defined (USING_FREEBSD) || defined (__APPLE__) || defined (__NetBSD__) static void get_cpu_info (double *mhz, int *cpus) @@ -554,7 +558,7 @@ *cpus = 1; #endif -#ifdef USING_FREEBSD +#if defined(USING_FREEBSD) || defined (__NetBSD__) int mib[2], ncpu; u_long freq; @@ -656,7 +660,7 @@ char * get_cpu_str (void) { -#if defined (USING_LINUX) || defined (USING_FREEBSD) || defined (__APPLE__) +#if defined (USING_LINUX) || defined (USING_FREEBSD) || defined (__APPLE__) || defined (__NetBSD__) double mhz; #endif int cpus = 1; @@ -670,7 +674,7 @@ uname (&un); -#if defined (USING_LINUX) || defined (USING_FREEBSD) || defined (__APPLE__) +#if defined (USING_LINUX) || defined (USING_FREEBSD) || defined (__APPLE__) || defined (__NetBSD__) get_cpu_info (&mhz, &cpus); if (mhz) {