diff options
| author | novel <novel@FreeBSD.org> | 2005-09-16 19:16:03 +0800 |
|---|---|---|
| committer | novel <novel@FreeBSD.org> | 2005-09-16 19:16:03 +0800 |
| commit | f474c33059ad4def08e7bca591ee0d45a1a8f3dd (patch) | |
| tree | f7819cd51ac137b2f291d753b3330eadbf24f729 /sysutils | |
| parent | c582d73ceaaa0da8707bc9ebcbf74dcdd7b61000 (diff) | |
| download | freebsd-ports-gnome-f474c33059ad4def08e7bca591ee0d45a1a8f3dd.tar.gz freebsd-ports-gnome-f474c33059ad4def08e7bca591ee0d45a1a8f3dd.tar.zst freebsd-ports-gnome-f474c33059ad4def08e7bca591ee0d45a1a8f3dd.zip | |
One more attempt to fix build on amd64.
Reported by: pointyhat via kris
Diffstat (limited to 'sysutils')
| -rw-r--r-- | sysutils/conky-awesome/files/patch-src-conky.c | 6 | ||||
| -rw-r--r-- | sysutils/conky-awesome/files/patch-src-conky.h | 4 | ||||
| -rw-r--r-- | sysutils/conky/files/patch-src-conky.c | 6 | ||||
| -rw-r--r-- | 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); |