From cd1b0b2fb1a3a192c3a36d6f08e26a9ccccb7cf3 Mon Sep 17 00:00:00 2001
From: Roman Bogorodskiy <novel@FreeBSD.org>
Date: Fri, 16 Sep 2005 11:16:03 +0000
Subject: [PATCH] One more attempt to fix build on amd64.

Reported by:	pointyhat via kris
---
 sysutils/conky-awesome/files/patch-src-conky.c | 6 +++---
 sysutils/conky-awesome/files/patch-src-conky.h | 4 ++--
 sysutils/conky/files/patch-src-conky.c         | 6 +++---
 sysutils/conky/files/patch-src-conky.h         | 4 ++--
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/sysutils/conky-awesome/files/patch-src-conky.c b/sysutils/conky-awesome/files/patch-src-conky.c
index 830f4a377f27..a6411f01c071 100644
--- a/sysutils/conky-awesome/files/patch-src-conky.c
+++ b/sysutils/conky-awesome/files/patch-src-conky.c
@@ -5,7 +5,7 @@
  	OBJ_uptime,
  	OBJ_uptime_short,
 -#ifdef __FreeBSD__
-+#if defined(__FreeBSD__) || defined(i386) || defined(__i386__)
++#if defined(__FreeBSD__) && (defined(i386) || defined(__i386__))
  	OBJ_apm_adapter,
  	OBJ_apm_battery_time,
  	OBJ_apm_battery_life,
@@ -15,7 +15,7 @@
  	    OBJ(adt746xcpu, 0) END OBJ(adt746xfan, 0) END
 -#ifdef __FreeBSD__
 -	OBJ(apm_adapter, 0) END
-+#if defined(__FreeBSD__) || defined(i386) || defined(__i386__)
++#if defined(__FreeBSD__) && (defined(i386) || defined(__i386__))
 +        OBJ(apm_adapter, 0) END
  	OBJ(apm_battery_life, 0) END
  	OBJ(apm_battery_time, 0) END
@@ -25,7 +25,7 @@
  			}
  
 -#ifdef __FreeBSD__
-+#if defined(__FreeBSD__) || defined(i386) || defined(__i386__)
++#if defined(__FreeBSD__) && (defined(i386) || defined(__i386__))
  			OBJ(apm_adapter) {
  				snprintf(p, n, "%s", get_apm_adapter());
  			}
diff --git a/sysutils/conky-awesome/files/patch-src-conky.h b/sysutils/conky-awesome/files/patch-src-conky.h
index 285e3ce8412a..0c6aa6f0ae20 100644
--- a/sysutils/conky-awesome/files/patch-src-conky.h
+++ b/sysutils/conky-awesome/files/patch-src-conky.h
@@ -5,7 +5,7 @@
  #endif /* X11 */
  
 -#if defined(__FreeBSD__)
-+#if defined(__FreeBSD__) || defined(i386) || defined(__i386__)
++#if defined(__FreeBSD__) && (defined(i386) || defined(__i386__))
  #include <machine/apm_bios.h>
  #endif /* __FreeBSD__ */
  
@@ -14,7 +14,7 @@
  
  /* in freebsd.c */
 -#ifdef __FreeBSD__
-+#if defined(__FreeBSD__) || defined(i386) || defined(__i386__)
++#if defined(__FreeBSD__) && (defined(i386) || defined(__i386__))
  int apm_getinfo(int fd, apm_info_t aip);
  char *get_apm_adapter(void);
  char *get_apm_battery_life(void);
diff --git a/sysutils/conky/files/patch-src-conky.c b/sysutils/conky/files/patch-src-conky.c
index 830f4a377f27..a6411f01c071 100644
--- a/sysutils/conky/files/patch-src-conky.c
+++ b/sysutils/conky/files/patch-src-conky.c
@@ -5,7 +5,7 @@
  	OBJ_uptime,
  	OBJ_uptime_short,
 -#ifdef __FreeBSD__
-+#if defined(__FreeBSD__) || defined(i386) || defined(__i386__)
++#if defined(__FreeBSD__) && (defined(i386) || defined(__i386__))
  	OBJ_apm_adapter,
  	OBJ_apm_battery_time,
  	OBJ_apm_battery_life,
@@ -15,7 +15,7 @@
  	    OBJ(adt746xcpu, 0) END OBJ(adt746xfan, 0) END
 -#ifdef __FreeBSD__
 -	OBJ(apm_adapter, 0) END
-+#if defined(__FreeBSD__) || defined(i386) || defined(__i386__)
++#if defined(__FreeBSD__) && (defined(i386) || defined(__i386__))
 +        OBJ(apm_adapter, 0) END
  	OBJ(apm_battery_life, 0) END
  	OBJ(apm_battery_time, 0) END
@@ -25,7 +25,7 @@
  			}
  
 -#ifdef __FreeBSD__
-+#if defined(__FreeBSD__) || defined(i386) || defined(__i386__)
++#if defined(__FreeBSD__) && (defined(i386) || defined(__i386__))
  			OBJ(apm_adapter) {
  				snprintf(p, n, "%s", get_apm_adapter());
  			}
diff --git a/sysutils/conky/files/patch-src-conky.h b/sysutils/conky/files/patch-src-conky.h
index 285e3ce8412a..0c6aa6f0ae20 100644
--- a/sysutils/conky/files/patch-src-conky.h
+++ b/sysutils/conky/files/patch-src-conky.h
@@ -5,7 +5,7 @@
  #endif /* X11 */
  
 -#if defined(__FreeBSD__)
-+#if defined(__FreeBSD__) || defined(i386) || defined(__i386__)
++#if defined(__FreeBSD__) && (defined(i386) || defined(__i386__))
  #include <machine/apm_bios.h>
  #endif /* __FreeBSD__ */
  
@@ -14,7 +14,7 @@
  
  /* in freebsd.c */
 -#ifdef __FreeBSD__
-+#if defined(__FreeBSD__) || defined(i386) || defined(__i386__)
++#if defined(__FreeBSD__) && (defined(i386) || defined(__i386__))
  int apm_getinfo(int fd, apm_info_t aip);
  char *get_apm_adapter(void);
  char *get_apm_battery_life(void);