diff options
Diffstat (limited to 'chat/xchat/patches/patch-ab')
| -rw-r--r-- | chat/xchat/patches/patch-ab | 30 |
1 files changed, 12 insertions, 18 deletions
diff --git a/chat/xchat/patches/patch-ab b/chat/xchat/patches/patch-ab index c557a76c734..4a379409678 100644 --- a/chat/xchat/patches/patch-ab +++ b/chat/xchat/patches/patch-ab @@ -1,57 +1,51 @@ -$NetBSD: patch-ab,v 1.11 2008/08/05 21:05:55 tron Exp $ +$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-05 21:23:28.000000000 +0100 -@@ -47,8 +47,16 @@ - #define WANTSOCKET - #include "inet.h" ++++ src/common/util.c 2008-08-15 11:16:47.000000000 +0100 +@@ -49,6 +49,10 @@ -+#if defined(__NetBSD__) -+#define USING_NETBSD /**/ -+#endif -+ #if defined (USING_FREEBSD) || defined (__APPLE__) #include <sys/sysctl.h> -+#elif defined(USING_NETBSD) ++#elif defined(__NetBSD__) +#define session NetBSD_session +#include <sys/sysctl.h> +#undef session #endif #ifdef SOCKS #include <socks.h> -@@ -510,7 +518,7 @@ +@@ -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 (USING_NETBSD) ++#if defined (USING_LINUX) || defined (USING_FREEBSD) || defined (__APPLE__) || defined (__NetBSD__) static void get_cpu_info (double *mhz, int *cpus) -@@ -554,7 +562,7 @@ +@@ -554,7 +558,7 @@ *cpus = 1; #endif -#ifdef USING_FREEBSD -+#if defined(USING_FREEBSD) || defined (USING_NETBSD) ++#if defined(USING_FREEBSD) || defined (__NetBSD__) int mib[2], ncpu; u_long freq; -@@ -656,7 +664,7 @@ +@@ -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 (USING_NETBSD) ++#if defined (USING_LINUX) || defined (USING_FREEBSD) || defined (__APPLE__) || defined (__NetBSD__) double mhz; #endif int cpus = 1; -@@ -670,7 +678,7 @@ +@@ -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 (USING_NETBSD) ++#if defined (USING_LINUX) || defined (USING_FREEBSD) || defined (__APPLE__) || defined (__NetBSD__) get_cpu_info (&mhz, &cpus); if (mhz) { |