mirror of
https://git.freebsd.org/ports.git
synced 2025-07-18 01:39:16 -04:00
One more attempt to fix build on amd64.
Reported by: pointyhat via kris
This commit is contained in:
parent
d2f2ed95b1
commit
cd1b0b2fb1
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=142917
4 changed files with 10 additions and 10 deletions
|
@ -5,7 +5,7 @@
|
||||||
OBJ_uptime,
|
OBJ_uptime,
|
||||||
OBJ_uptime_short,
|
OBJ_uptime_short,
|
||||||
-#ifdef __FreeBSD__
|
-#ifdef __FreeBSD__
|
||||||
+#if defined(__FreeBSD__) || defined(i386) || defined(__i386__)
|
+#if defined(__FreeBSD__) && (defined(i386) || defined(__i386__))
|
||||||
OBJ_apm_adapter,
|
OBJ_apm_adapter,
|
||||||
OBJ_apm_battery_time,
|
OBJ_apm_battery_time,
|
||||||
OBJ_apm_battery_life,
|
OBJ_apm_battery_life,
|
||||||
|
@ -15,7 +15,7 @@
|
||||||
OBJ(adt746xcpu, 0) END OBJ(adt746xfan, 0) END
|
OBJ(adt746xcpu, 0) END OBJ(adt746xfan, 0) END
|
||||||
-#ifdef __FreeBSD__
|
-#ifdef __FreeBSD__
|
||||||
- OBJ(apm_adapter, 0) END
|
- 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_adapter, 0) END
|
||||||
OBJ(apm_battery_life, 0) END
|
OBJ(apm_battery_life, 0) END
|
||||||
OBJ(apm_battery_time, 0) END
|
OBJ(apm_battery_time, 0) END
|
||||||
|
@ -25,7 +25,7 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
-#ifdef __FreeBSD__
|
-#ifdef __FreeBSD__
|
||||||
+#if defined(__FreeBSD__) || defined(i386) || defined(__i386__)
|
+#if defined(__FreeBSD__) && (defined(i386) || defined(__i386__))
|
||||||
OBJ(apm_adapter) {
|
OBJ(apm_adapter) {
|
||||||
snprintf(p, n, "%s", get_apm_adapter());
|
snprintf(p, n, "%s", get_apm_adapter());
|
||||||
}
|
}
|
||||||
|
|
|
@ -5,7 +5,7 @@
|
||||||
#endif /* X11 */
|
#endif /* X11 */
|
||||||
|
|
||||||
-#if defined(__FreeBSD__)
|
-#if defined(__FreeBSD__)
|
||||||
+#if defined(__FreeBSD__) || defined(i386) || defined(__i386__)
|
+#if defined(__FreeBSD__) && (defined(i386) || defined(__i386__))
|
||||||
#include <machine/apm_bios.h>
|
#include <machine/apm_bios.h>
|
||||||
#endif /* __FreeBSD__ */
|
#endif /* __FreeBSD__ */
|
||||||
|
|
||||||
|
@ -14,7 +14,7 @@
|
||||||
|
|
||||||
/* in freebsd.c */
|
/* in freebsd.c */
|
||||||
-#ifdef __FreeBSD__
|
-#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);
|
int apm_getinfo(int fd, apm_info_t aip);
|
||||||
char *get_apm_adapter(void);
|
char *get_apm_adapter(void);
|
||||||
char *get_apm_battery_life(void);
|
char *get_apm_battery_life(void);
|
||||||
|
|
|
@ -5,7 +5,7 @@
|
||||||
OBJ_uptime,
|
OBJ_uptime,
|
||||||
OBJ_uptime_short,
|
OBJ_uptime_short,
|
||||||
-#ifdef __FreeBSD__
|
-#ifdef __FreeBSD__
|
||||||
+#if defined(__FreeBSD__) || defined(i386) || defined(__i386__)
|
+#if defined(__FreeBSD__) && (defined(i386) || defined(__i386__))
|
||||||
OBJ_apm_adapter,
|
OBJ_apm_adapter,
|
||||||
OBJ_apm_battery_time,
|
OBJ_apm_battery_time,
|
||||||
OBJ_apm_battery_life,
|
OBJ_apm_battery_life,
|
||||||
|
@ -15,7 +15,7 @@
|
||||||
OBJ(adt746xcpu, 0) END OBJ(adt746xfan, 0) END
|
OBJ(adt746xcpu, 0) END OBJ(adt746xfan, 0) END
|
||||||
-#ifdef __FreeBSD__
|
-#ifdef __FreeBSD__
|
||||||
- OBJ(apm_adapter, 0) END
|
- 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_adapter, 0) END
|
||||||
OBJ(apm_battery_life, 0) END
|
OBJ(apm_battery_life, 0) END
|
||||||
OBJ(apm_battery_time, 0) END
|
OBJ(apm_battery_time, 0) END
|
||||||
|
@ -25,7 +25,7 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
-#ifdef __FreeBSD__
|
-#ifdef __FreeBSD__
|
||||||
+#if defined(__FreeBSD__) || defined(i386) || defined(__i386__)
|
+#if defined(__FreeBSD__) && (defined(i386) || defined(__i386__))
|
||||||
OBJ(apm_adapter) {
|
OBJ(apm_adapter) {
|
||||||
snprintf(p, n, "%s", get_apm_adapter());
|
snprintf(p, n, "%s", get_apm_adapter());
|
||||||
}
|
}
|
||||||
|
|
|
@ -5,7 +5,7 @@
|
||||||
#endif /* X11 */
|
#endif /* X11 */
|
||||||
|
|
||||||
-#if defined(__FreeBSD__)
|
-#if defined(__FreeBSD__)
|
||||||
+#if defined(__FreeBSD__) || defined(i386) || defined(__i386__)
|
+#if defined(__FreeBSD__) && (defined(i386) || defined(__i386__))
|
||||||
#include <machine/apm_bios.h>
|
#include <machine/apm_bios.h>
|
||||||
#endif /* __FreeBSD__ */
|
#endif /* __FreeBSD__ */
|
||||||
|
|
||||||
|
@ -14,7 +14,7 @@
|
||||||
|
|
||||||
/* in freebsd.c */
|
/* in freebsd.c */
|
||||||
-#ifdef __FreeBSD__
|
-#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);
|
int apm_getinfo(int fd, apm_info_t aip);
|
||||||
char *get_apm_adapter(void);
|
char *get_apm_adapter(void);
|
||||||
char *get_apm_battery_life(void);
|
char *get_apm_battery_life(void);
|
||||||
|
|
Loading…
Add table
Reference in a new issue