Hi Bruce,
2011/11/24 Bruce Evans <b...@optusnet.com.au>:
> Now it adds lots of namespace pollution (all of <sys/param.h>, including
> all of its namespace pollution), just to get 1 new symbol defined.
Well, my initial patch (see mail with same subject modulo "v2") didn't
have this problem. Now that __FreeBSD_kernel__ is defined, many
#ifdefs can be simplified, but maybe it's not desireable for all of
them. At least not until we can rely on the compiler to define this
macro.
So in this particular case maybe it's better to use the other approach?
See attachment.
diff -ur sys.old/cam/scsi/scsi_low.h sys/cam/scsi/scsi_low.h
--- sys.old/cam/scsi/scsi_low.h 2007-12-25 18:52:02.000000000 +0100
+++ sys/cam/scsi/scsi_low.h 2011-11-13 14:12:41.121908380 +0100
@@ -53,7 +53,7 @@
#define SCSI_LOW_INTERFACE_XS
#endif /* __NetBSD__ */
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
#define SCSI_LOW_INTERFACE_CAM
#define CAM
#endif /* __FreeBSD__ */
@@ -64,7 +64,7 @@
#include <dev/isa/ccbque.h>
#endif /* __NetBSD__ */
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
#include <sys/device_port.h>
#include <sys/kdb.h>
#include <cam/cam.h>
@@ -85,7 +85,7 @@
#define SCSI_LOW_BZERO(pt, size) memset((pt), 0, (size))
#endif /* __NetBSD__ */
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
#undef MSG_IDENTIFY
#define SCSI_LOW_DEBUGGER(dev) kdb_enter(KDB_WHY_CAM, dev)
#define SCSI_LOW_DELAY(mu) DELAY((mu))
@@ -111,7 +111,7 @@
};
#endif /* __NetBSD__ */
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
typedef struct scsi_sense_data scsi_low_osdep_sense_data_t;
struct scsi_low_osdep_interface {
diff -ur sys.old/cam/scsi/scsi_low_pisa.h sys/cam/scsi/scsi_low_pisa.h
--- sys.old/cam/scsi/scsi_low_pisa.h 2005-01-05 23:34:37.000000000 +0100
+++ sys/cam/scsi/scsi_low_pisa.h 2011-11-13 14:12:41.121908380 +0100
@@ -40,7 +40,7 @@
int scsi_low_notify_pisa(pisa_device_handle_t, pisa_event_t);
#endif /* __NetBSD__ */
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
int scsi_low_activate_pisa(struct scsi_low_softc *, int);
int scsi_low_deactivate_pisa(struct scsi_low_softc *);
#endif /* __FreeBSD__ */
diff -ur sys.old/contrib/altq/altq/altq_var.h sys/contrib/altq/altq/altq_var.h
--- sys.old/contrib/altq/altq/altq_var.h 2011-03-10 19:49:15.000000000 +0100
+++ sys/contrib/altq/altq/altq_var.h 2011-11-13 14:12:41.118907341 +0100
@@ -201,7 +201,7 @@
#define CALLOUT_STOP(c) untimeout((c)->c_func,(c)->c_arg)
#define CALLOUT_INITIALIZER { NULL, NULL }
#endif
-#if !defined(__FreeBSD__)
+#if !defined(__FreeBSD__) && !defined(__FreeBSD_kernel__)
typedef void (timeout_t)(void *);
#endif
diff -ur sys.old/contrib/altq/altq/if_altq.h sys/contrib/altq/altq/if_altq.h
--- sys.old/contrib/altq/altq/if_altq.h 2011-03-10 19:49:15.000000000 +0100
+++ sys/contrib/altq/altq/if_altq.h 2011-11-13 14:12:41.119907128 +0100
@@ -29,7 +29,7 @@
#ifndef _ALTQ_IF_ALTQ_H_
#define _ALTQ_IF_ALTQ_H_
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
#include <sys/lock.h> /* XXX */
#include <sys/mutex.h> /* XXX */
#include <sys/event.h> /* XXX */
@@ -51,7 +51,7 @@
int ifq_len;
int ifq_maxlen;
int ifq_drops;
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
struct mtx ifq_mtx;
#endif
diff -ur sys.old/contrib/pf/net/if_pflog.h sys/contrib/pf/net/if_pflog.h
--- sys.old/contrib/pf/net/if_pflog.h 2011-06-28 13:57:25.000000000 +0200
+++ sys/contrib/pf/net/if_pflog.h 2011-11-13 14:12:41.130906469 +0100
@@ -30,7 +30,7 @@
#define PFLOGIFS_MAX 16
struct pflog_softc {
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
struct ifnet *sc_ifp; /* the interface pointer */
#else
struct ifnet sc_if; /* the interface */
@@ -74,7 +74,7 @@
#define OLD_PFLOG_HDRLEN sizeof(struct old_pfloghdr)
#ifdef _KERNEL
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
struct pf_rule;
struct pf_ruleset;
struct pfi_kif;
diff -ur sys.old/contrib/pf/net/if_pflow.h sys/contrib/pf/net/if_pflow.h
--- sys.old/contrib/pf/net/if_pflow.h 2011-06-28 13:57:25.000000000 +0200
+++ sys/contrib/pf/net/if_pflow.h 2011-11-13 14:12:41.130906469 +0100
@@ -66,7 +66,7 @@
unsigned int sc_maxcount;
u_int64_t sc_gcounter;
struct ip_moptions sc_imo;
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
struct callout sc_tmo;
#else
struct timeout sc_tmo;
diff -ur sys.old/contrib/pf/net/if_pfsync.h sys/contrib/pf/net/if_pfsync.h
--- sys.old/contrib/pf/net/if_pfsync.h 2011-06-28 13:57:25.000000000 +0200
+++ sys/contrib/pf/net/if_pfsync.h 2011-11-13 14:12:41.131906257 +0100
@@ -268,7 +268,7 @@
int pfsyncr_authlevel;
};
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
#define SIOCSETPFSYNC _IOW('i', 247, struct ifreq)
#define SIOCGETPFSYNC _IOWR('i', 248, struct ifreq)
#endif
@@ -288,7 +288,7 @@
#define PFSYNC_S_DEFER 0xfe
#define PFSYNC_S_NONE 0xff
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
void pfsync_input(struct mbuf *, __unused int);
#else
void pfsync_input(struct mbuf *, ...);
@@ -300,7 +300,7 @@
#define PFSYNC_SI_CKSUM 0x02
#define PFSYNC_SI_ACK 0x04
int pfsync_state_import(struct pfsync_state *, u_int8_t);
-#ifndef __FreeBSD__
+#if !defined(__FreeBSD__) && !defined(__FreeBSD_kernel__)
void pfsync_state_export(struct pfsync_state *,
struct pf_state *);
#endif
diff -ur sys.old/contrib/pf/net/pfvar.h sys/contrib/pf/net/pfvar.h
--- sys.old/contrib/pf/net/pfvar.h 2011-10-23 12:05:25.000000000 +0200
+++ sys/contrib/pf/net/pfvar.h 2011-11-13 14:12:41.134906738 +0100
@@ -37,7 +37,7 @@
#include <sys/types.h>
#include <sys/queue.h>
#include <sys/tree.h>
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
#include <sys/lock.h>
#include <sys/sx.h>
#else
@@ -46,7 +46,7 @@
#include <net/radix.h>
#include <net/route.h>
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
#include <net/if_clone.h>
#include <net/pf_mtag.h>
#include <vm/uma.h>
@@ -54,7 +54,7 @@
#include <netinet/ip_ipsp.h>
#endif
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
#include <netinet/in.h>
#endif
@@ -62,7 +62,7 @@
struct ip;
struct ip6_hdr;
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
struct inpcb;
#endif
@@ -173,7 +173,7 @@
} a;
char ifname[IFNAMSIZ];
char tblname[PF_TABLE_NAME_SIZE];
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
#define RTLABEL_LEN 32
#endif
char rtlabelname[RTLABEL_LEN];
@@ -211,7 +211,7 @@
* Address manipulation macros
*/
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
#define splsoftnet() splnet()
#define HTONL(x) (x) = htonl((__uint32_t)(x))
@@ -236,7 +236,7 @@
if (var) \
uma_zdestroy(var)
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
extern struct mtx pf_task_mtx;
#define PF_LOCK_ASSERT() mtx_assert(&pf_task_mtx, MA_OWNED)
@@ -833,7 +833,7 @@
u_int64_t id;
u_int32_t creatorid;
u_int8_t direction;
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
u_int8_t pad[2];
u_int8_t local_flags;
#define PFSTATE_EXPIRING 0x01
@@ -923,7 +923,7 @@
sa_family_t af;
u_int8_t proto;
u_int8_t direction;
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
u_int8_t local_flags;
#define PFSTATE_EXPIRING 0x01
u_int8_t pad;
@@ -935,7 +935,7 @@
u_int8_t updates;
} __packed;
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
#ifdef _KERNEL
/* pfsync */
typedef int pfsync_state_import_t(struct pfsync_state *, u_int8_t);
@@ -1215,7 +1215,7 @@
RB_HEAD(pfi_ifhead, pfi_kif);
/* state tables */
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
#ifdef _KERNEL
VNET_DECLARE(struct pf_state_tree, pf_statetbl);
#define V_pf_statetbl VNET(pf_statetbl)
@@ -1277,7 +1277,7 @@
struct pf_addr *dst; /* dst address */
u_int16_t *sport;
u_int16_t *dport;
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
struct pf_mtag *pf_mtag;
#endif
@@ -1403,7 +1403,7 @@
*(a) = (x); \
} while (0)
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
#define REASON_SET(a, x) \
do { \
if ((a) != NULL) \
@@ -1488,7 +1488,7 @@
u_int32_t parent_qid; /* parent queue id */
u_int32_t bandwidth; /* queue bandwidth */
u_int8_t priority; /* priority */
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
u_int8_t local_flags; /* dynamic interface */
#define PFALTQ_FLAG_IF_REMOVED 0x01
#endif
@@ -1768,7 +1768,7 @@
#define DIOCSETIFFLAG _IOWR('D', 89, struct pfioc_iface)
#define DIOCCLRIFFLAG _IOWR('D', 90, struct pfioc_iface)
#define DIOCKILLSRCNODES _IOWR('D', 91, struct pfioc_src_node_kill)
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
struct pf_ifspeed {
char ifname[IFNAMSIZ];
u_int32_t baudrate;
@@ -1779,7 +1779,7 @@
#ifdef _KERNEL
RB_HEAD(pf_src_tree, pf_src_node);
RB_PROTOTYPE(pf_src_tree, pf_src_node, entry, pf_src_compare);
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
VNET_DECLARE(struct pf_src_tree, tree_src_tracking);
#define V_tree_src_tracking VNET(tree_src_tracking)
#else
@@ -1789,7 +1789,7 @@
RB_HEAD(pf_state_tree_id, pf_state);
RB_PROTOTYPE(pf_state_tree_id, pf_state,
entry_id, pf_state_compare_id);
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
VNET_DECLARE(struct pf_state_tree_id, tree_id);
#define V_tree_id VNET(tree_id)
VNET_DECLARE(struct pf_state_queue, state_list);
@@ -1800,14 +1800,14 @@
#endif
TAILQ_HEAD(pf_poolqueue, pf_pool);
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
VNET_DECLARE(struct pf_poolqueue, pf_pools[2]);
#define V_pf_pools VNET(pf_pools)
#else
extern struct pf_poolqueue pf_pools[2];
#endif
TAILQ_HEAD(pf_altqqueue, pf_altq);
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
VNET_DECLARE(struct pf_altqqueue, pf_altqs[2]);
#define V_pf_altqs VNET(pf_altqs)
VNET_DECLARE(struct pf_palist, pf_pabuf);
@@ -1817,7 +1817,7 @@
extern struct pf_palist pf_pabuf;
#endif
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
VNET_DECLARE(u_int32_t, ticket_altqs_active);
#define V_ticket_altqs_active VNET(ticket_altqs_active)
VNET_DECLARE(u_int32_t, ticket_altqs_inactive);
@@ -1849,7 +1849,7 @@
extern void pf_tbladdr_remove(struct pf_addr_wrap *);
extern void pf_tbladdr_copyout(struct pf_addr_wrap *);
extern void pf_calc_skip_steps(struct pf_rulequeue *);
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
#ifdef ALTQ
extern void pf_altq_ifnet_event(struct ifnet *, int);
#endif
@@ -1886,7 +1886,7 @@
extern struct pool pf_state_scrub_pl;
#endif
extern void pf_purge_thread(void *);
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
extern int pf_purge_expired_src_nodes(int);
extern int pf_purge_expired_states(u_int32_t , int);
#else
@@ -1911,7 +1911,7 @@
extern u_int16_t pf_cksum_fixup(u_int16_t, u_int16_t, u_int16_t,
u_int8_t);
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
VNET_DECLARE(struct ifnet *, sync_ifp);
#define V_sync_ifp VNET(sync_ifp);
VNET_DECLARE(struct pf_rule, pf_default_rule);
@@ -1924,12 +1924,12 @@
u_int8_t);
void pf_rm_rule(struct pf_rulequeue *,
struct pf_rule *);
-#ifndef __FreeBSD__
+#if !defined(__FreeBSD__) && !defined(__FreeBSD_kernel__)
struct pf_divert *pf_find_divert(struct mbuf *);
#endif
#ifdef INET
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
int pf_test(int, struct ifnet *, struct mbuf **, struct ether_header *,
struct inpcb *);
#else
@@ -1938,7 +1938,7 @@
#endif /* INET */
#ifdef INET6
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
int pf_test6(int, struct ifnet *, struct mbuf **, struct ether_header *,
struct inpcb *);
#else
@@ -1949,7 +1949,7 @@
void pf_addr_inc(struct pf_addr *, sa_family_t);
#endif /* INET6 */
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
u_int32_t pf_new_isn(struct pf_state *);
#endif
void *pf_pull_hdr(struct mbuf *, int, void *, int, u_short *, u_short *,
@@ -1986,7 +1986,7 @@
void pf_purge_expired_fragments(void);
int pf_routable(struct pf_addr *addr, sa_family_t af, struct pfi_kif *);
int pf_rtlabel_match(struct pf_addr *, sa_family_t, struct pf_addr_wrap *);
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
int pf_socket_lookup(int, struct pf_pdesc *, struct inpcb *);
#else
int pf_socket_lookup(int, struct pf_pdesc *);
@@ -2031,7 +2031,7 @@
int pfr_ina_define(struct pfr_table *, struct pfr_addr *, int, int *,
int *, u_int32_t, int);
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
VNET_DECLARE(struct pfi_kif *, pfi_all);
#define V_pfi_all VNET(pfi_all)
#else
@@ -2039,7 +2039,7 @@
#endif
void pfi_initialize(void);
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
void pfi_cleanup(void);
#endif
struct pfi_kif *pfi_kif_get(const char *);
@@ -2061,7 +2061,7 @@
int pfi_set_flags(const char *, int);
int pfi_clear_flags(const char *, int);
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
int pf_match_tag(struct mbuf *, struct pf_rule *, int *,
struct pf_mtag *);
#else
@@ -2071,7 +2071,7 @@
void pf_tag2tagname(u_int16_t, char *);
void pf_tag_ref(u_int16_t);
void pf_tag_unref(u_int16_t);
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
int pf_tag_packet(struct mbuf *, int, int, struct pf_mtag *);
#else
int pf_tag_packet(struct mbuf *, int, int);
@@ -2080,14 +2080,14 @@
void pf_qid2qname(u_int32_t, char *);
void pf_qid_unref(u_int32_t);
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
VNET_DECLARE(struct pf_status, pf_status);
#define V_pf_status VNET(pf_status)
#else
extern struct pf_status pf_status;
#endif
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
VNET_DECLARE(uma_zone_t, pf_frent_pl);
#define V_pf_frent_pl VNET(pf_frent_pl)
VNET_DECLARE(uma_zone_t, pf_frag_pl);
@@ -2103,14 +2103,14 @@
void *pp;
unsigned limit;
};
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
VNET_DECLARE(struct pf_pool_limit, pf_pool_limits[PF_LIMIT_MAX]);
#define V_pf_pool_limits VNET(pf_pool_limits)
#else
extern struct pf_pool_limit pf_pool_limits[PF_LIMIT_MAX];
#endif
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
struct pf_frent {
LIST_ENTRY(pf_frent) fr_next;
struct ip *fr_ip;
@@ -2144,7 +2144,7 @@
#endif /* _KERNEL */
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
#ifdef _KERNEL
VNET_DECLARE(struct pf_anchor_global, pf_anchors);
#define V_pf_anchors VNET(pf_anchors)
@@ -2172,7 +2172,7 @@
struct pf_ruleset *pf_find_or_create_ruleset(const char *);
void pf_rs_initialize(void);
-#ifndef __FreeBSD__
+#if !defined(__FreeBSD__) && !defined(__FreeBSD_kernel__)
#ifdef _KERNEL
int pf_anchor_copyout(const struct pf_ruleset *,
const struct pf_rule *, struct pfioc_rule *);
@@ -2193,7 +2193,7 @@
const struct tcphdr *);
void pf_osfp_flush(void);
int pf_osfp_get(struct pf_osfp_ioctl *);
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
int pf_osfp_initialize(void);
void pf_osfp_cleanup(void);
#else
diff -ur sys.old/dev/firewire/firewirereg.h sys/dev/firewire/firewirereg.h
--- sys.old/dev/firewire/firewirereg.h 2007-07-20 05:42:57.000000000 +0200
+++ sys/dev/firewire/firewirereg.h 2011-11-13 14:12:41.122907609 +0100
@@ -75,7 +75,7 @@
};
struct firewire_softc {
-#if defined(__FreeBSD__) && __FreeBSD_version >= 500000
+#if (defined(__FreeBSD__) || defined(__FreeBSD_kernel__)) && __FreeBSD_version >= 500000
struct cdev *dev;
#endif
struct firewire_comm *fc;
diff -ur sys.old/dev/lmc/if_lmc.h sys/dev/lmc/if_lmc.h
--- sys.old/dev/lmc/if_lmc.h 2009-11-19 19:21:51.000000000 +0100
+++ sys/dev/lmc/if_lmc.h 2011-11-13 14:12:41.124908302 +0100
@@ -984,7 +984,7 @@
#endif
u_int32_t address1; /* buffer1 bus address */
u_int32_t address2; /* buffer2 bus address */
-#if (defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__))
+#if (defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__) || defined(__OpenBSD__))
bus_dmamap_t map; /* bus dmamap for this descriptor */
# define TLP_BUS_DSL_VAL (sizeof(bus_dmamap_t) & TLP_BUS_DSL)
#else
@@ -1035,7 +1035,7 @@
#elif BSD
struct mbuf *head; /* tail-queue of mbufs */
struct mbuf *tail;
-# if (defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__))
+# if (defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__) || defined(__OpenBSD__))
bus_dma_tag_t tag; /* bus_dma tag for desc array */
bus_dmamap_t map; /* bus_dma map for desc array */
bus_dma_segment_t segs[2]; /* bus_dmamap_load() or bus_dmamem_alloc() */
@@ -1068,7 +1068,7 @@
*/
#define IOREF_CSR 1 /* access Tulip CSRs with IO cycles if 1 */
-#if (defined(__FreeBSD__) && defined(DEVICE_POLLING))
+#if ((defined(__FreeBSD__) || defined(__FreeBSD_kernel__)) && defined(DEVICE_POLLING))
# define DEV_POLL 1
#else
# define DEV_POLL 0
@@ -1151,7 +1151,7 @@
# endif
#endif
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
struct callout callout; /* watchdog needs this */
struct device *dev; /* base device pointer */
bus_space_tag_t csr_tag; /* bus_space needs this */
@@ -1210,7 +1210,7 @@
/* Hide the minor differences between OS versions */
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
typedef void intr_return_t;
# define READ_PCI_CFG(sc, addr) pci_read_config ((sc)->dev, addr, 4)
# define WRITE_PCI_CFG(sc, addr, data) pci_write_config((sc)->dev, addr, data, 4)
@@ -1428,7 +1428,7 @@
#endif
#if (defined(__bsdi__) || /* unconditionally */ \
- (defined(__FreeBSD__) && (__FreeBSD_version < 503000)) || \
+ ((defined(__FreeBSD__) || defined(__FreeBSD_kernel__)) && (__FreeBSD_version < 503000)) || \
(defined(__NetBSD__) && (__NetBSD_Version__ < 106000000)) || \
(defined(__OpenBSD__) && ( OpenBSD < 200111)))
# define IFQ_ENQUEUE(ifq, m, pa, err) \
@@ -1531,7 +1531,7 @@
static int t1_ioctl(softc_t *, struct ioctl *);
#if IFNET
-# if ((defined(__FreeBSD__) && (__FreeBSD_version < 500000)) ||\
+# if (((defined(__FreeBSD__) || defined(__FreeBSD_kernel__)) && __FreeBSD_version < 500000) ||\
defined(__NetBSD__) || defined(__OpenBSD__) || defined(__bsdi__))
static void netisr_dispatch(int, struct mbuf *);
# endif
@@ -1541,7 +1541,7 @@
#if BSD
static void mbuf_enqueue(struct desc_ring *, struct mbuf *);
static struct mbuf* mbuf_dequeue(struct desc_ring *);
-# ifdef __FreeBSD__
+# if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
static void fbsd_dmamap_load(void *, bus_dma_segment_t *, int, int);
# endif
static int create_ring(softc_t *, struct desc_ring *, int);
@@ -1570,7 +1570,7 @@
static void core_interrupt(void *, int);
static void user_interrupt(softc_t *, int);
#if BSD
-# if (defined(__FreeBSD__) && defined(DEVICE_POLLING))
+# if (defined(__FreeBSD__) || defined(__FreeBSD_kernel__)) && defined(DEVICE_POLLING)
static int fbsd_poll(struct ifnet *, enum poll_cmd, int);
# endif
static intr_return_t bsd_interrupt(void *);
@@ -1638,7 +1638,7 @@
static int attach_card(softc_t *, const char *);
static void detach_card(softc_t *);
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
static int fbsd_probe(device_t);
static int fbsd_detach(device_t);
static int fbsd_shutdown(device_t);
diff -ur sys.old/dev/mpt/mpilib/mpi_type.h sys/dev/mpt/mpilib/mpi_type.h
--- sys.old/dev/mpt/mpilib/mpi_type.h 2006-02-26 23:50:14.000000000 +0100
+++ sys/dev/mpt/mpilib/mpi_type.h 2011-11-13 14:12:41.125906693 +0100
@@ -77,7 +77,7 @@
typedef signed short S16;
typedef unsigned short U16;
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
typedef int32_t S32;
typedef uint32_t U32;
diff -ur sys.old/dev/wi/if_wireg.h sys/dev/wi/if_wireg.h
--- sys.old/dev/wi/if_wireg.h 2009-05-20 22:00:40.000000000 +0200
+++ sys/dev/wi/if_wireg.h 2011-11-13 14:12:41.127906547 +0100
@@ -84,7 +84,7 @@
#ifdef __NetBSD__
#define OS_STRING_NAME "NetBSD"
#endif
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
#define OS_STRING_NAME "FreeBSD"
#endif
#ifdef __OpenBSD__
diff -ur sys.old/fs/nfs/nfs_var.h sys/fs/nfs/nfs_var.h
--- sys.old/fs/nfs/nfs_var.h 2011-07-16 10:05:17.000000000 +0200
+++ sys/fs/nfs/nfs_var.h 2011-11-13 14:12:41.128906615 +0100
@@ -76,7 +76,7 @@
struct nfsvattr;
struct nfs_vattr;
struct NFSSVCARGS;
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
NFS_ACCESS_ARGS;
NFS_OPEN_ARGS;
NFS_GETATTR_ARGS;
diff -ur sys.old/net/if_atm.h sys/net/if_atm.h
--- sys.old/net/if_atm.h 2009-04-16 22:30:28.000000000 +0200
+++ sys/net/if_atm.h 2011-11-13 14:12:41.129906402 +0100
@@ -202,7 +202,7 @@
#if defined(__NetBSD__) || defined(__OpenBSD__) || defined(__bsdi__)
#define RTALLOC1(A,B) rtalloc1((A),(B))
-#elif defined(__FreeBSD__)
+#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
#define RTALLOC1(A,B) rtalloc1((A),(B),0UL)
#endif
diff -ur sys.old/net/zlib.h sys/net/zlib.h
--- sys.old/net/zlib.h 2010-03-02 07:58:58.000000000 +0100
+++ sys/net/zlib.h 2011-11-13 14:12:41.135906525 +0100
@@ -510,7 +510,7 @@
done by inflate().
*/
-#if defined(__FreeBSD__) && defined(_KERNEL)
+#if (defined(__FreeBSD__) || defined(__FreeBSD_kernel__)) && defined(_KERNEL)
#define inflate inflate_ppp /* FreeBSD already has an inflate :-( */
#endif
diff -ur sys.old/net80211/ieee80211_ioctl.h sys/net80211/ieee80211_ioctl.h
--- sys.old/net80211/ieee80211_ioctl.h 2011-06-16 11:37:20.000000000 +0200
+++ sys/net80211/ieee80211_ioctl.h 2011-11-13 14:12:41.137907777 +0100
@@ -569,7 +569,7 @@
uint16_t sv_vlan;
};
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
/*
* FreeBSD-style ioctls.
*/
diff -ur sys.old/net80211/ieee80211_var.h sys/net80211/ieee80211_var.h
--- sys.old/net80211/ieee80211_var.h 2011-06-20 13:46:03.000000000 +0200
+++ sys/net80211/ieee80211_var.h 2011-11-13 14:12:41.141909721 +0100
@@ -34,7 +34,7 @@
/* NB: portability glue must go first */
#if defined(__NetBSD__)
#include <net80211/ieee80211_netbsd.h>
-#elif defined(__FreeBSD__)
+#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
#include <net80211/ieee80211_freebsd.h>
#elif defined(__linux__)
#include <net80211/ieee80211_linux.h>
diff -ur sys.old/netinet/sctp_constants.h sys/netinet/sctp_constants.h
--- sys.old/netinet/sctp_constants.h 2011-09-17 10:50:29.000000000 +0200
+++ sys/netinet/sctp_constants.h 2011-11-13 14:12:41.145908872 +0100
@@ -1020,7 +1020,7 @@
#define SCTP_GETTIME_TIMEVAL(x) (getmicrouptime(x))
#define SCTP_GETPTIME_TIMEVAL(x) (microuptime(x))
#endif
-/*#if defined(__FreeBSD__) || defined(__APPLE__)*/
+/*#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__APPLE__)*/
/*#define SCTP_GETTIME_TIMEVAL(x) { \*/
/* (x)->tv_sec = ticks / 1000; \*/
/* (x)->tv_usec = (ticks % 1000) * 1000; \*/
diff -ur sys.old/netinet/sctp_pcb.h sys/netinet/sctp_pcb.h
--- sys.old/netinet/sctp_pcb.h 2011-09-14 10:15:21.000000000 +0200
+++ sys/netinet/sctp_pcb.h 2011-11-13 14:12:41.148909632 +0100
@@ -240,7 +240,7 @@
* All static structures that anchor the system must be here.
*/
struct sctp_epinfo sctppcbinfo;
-#if defined(__FreeBSD__) && defined(SMP) && defined(SCTP_USE_PERCPU_STAT)
+#if (defined(__FreeBSD__) || defined(__FreeBSD_kernel__)) && defined(SMP) && defined(SCTP_USE_PERCPU_STAT)
struct sctpstat *sctpstat;
#else
struct sctpstat sctpstat;
@@ -632,7 +632,7 @@
struct sctp_inpcb *,
uint8_t co_off);
-#if defined(__FreeBSD__) && defined(SCTP_MCORE_INPUT) && defined(SMP)
+#if (defined(__FreeBSD__) || defined(__FreeBSD_kernel__)) && defined(SCTP_MCORE_INPUT) && defined(SMP)
void
sctp_queue_to_mcore(struct mbuf *m, int off, int cpu_to_use);
diff -ur sys.old/netinet/sctp_structs.h sys/netinet/sctp_structs.h
--- sys.old/netinet/sctp_structs.h 2011-10-10 18:31:18.000000000 +0200
+++ sys/netinet/sctp_structs.h 2011-11-13 14:12:41.150907531 +0100
@@ -108,7 +108,7 @@
typedef int (*inp_func) (struct sctp_inpcb *, void *ptr, uint32_t val);
typedef void (*end_func) (void *ptr, uint32_t val);
-#if defined(__FreeBSD__) && defined(SCTP_MCORE_INPUT) && defined(SMP)
+#if (defined(__FreeBSD__) || defined(__FreeBSD_kernel__)) && defined(SCTP_MCORE_INPUT) && defined(SMP)
/* whats on the mcore control struct */
struct sctp_mcore_queue {
TAILQ_ENTRY(sctp_mcore_queue) next;
diff -ur sys.old/netinet/sctp_uio.h sys/netinet/sctp_uio.h
--- sys.old/netinet/sctp_uio.h 2011-08-14 22:55:32.000000000 +0200
+++ sys/netinet/sctp_uio.h 2011-11-13 14:12:41.152905989 +0100
@@ -1056,7 +1056,7 @@
#define SCTP_STAT_INCR(_x) SCTP_STAT_INCR_BY(_x,1)
#define SCTP_STAT_DECR(_x) SCTP_STAT_DECR_BY(_x,1)
-#if defined(__FreeBSD__) && defined(SMP) && defined(SCTP_USE_PERCPU_STAT)
+#if (defined(__FreeBSD__) || defined(__FreeBSD_kernel__)) && defined(SMP) && defined(SCTP_USE_PERCPU_STAT)
#define SCTP_STAT_INCR_BY(_x,_d) (SCTP_BASE_STATS[PCPU_GET(cpuid)]._x += _d)
#define SCTP_STAT_DECR_BY(_x,_d) (SCTP_BASE_STATS[PCPU_GET(cpuid)]._x -= _d)
#else
diff -ur sys.old/sys/device_port.h sys/sys/device_port.h
--- sys.old/sys/device_port.h 2005-01-19 02:31:33.000000000 +0100
+++ sys/sys/device_port.h 2011-11-13 14:12:41.153907174 +0100
@@ -29,7 +29,7 @@
#if defined(__NetBSD__)
# include <sys/device.h>
-#elif defined(__FreeBSD__)
+#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
# include <sys/module.h>
# include <sys/bus.h>
#endif
@@ -43,7 +43,7 @@
# define DEVPORT_DEVNAME(dev) (dev).dv_xname
# define DEVPORT_DEVUNIT(dev) (dev).dv_unit
-#elif defined(__FreeBSD__)
+#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
/*
* FreeBSD (compatibility for struct device)
*/
diff -ur sys.old/sys/timex.h sys/sys/timex.h
--- sys.old/sys/timex.h 2005-01-07 03:29:27.000000000 +0100
+++ sys/sys/timex.h 2011-11-13 14:12:41.155907587 +0100
@@ -218,7 +218,7 @@
long stbcnt; /* stability limit exceeded (ro) */
};
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
#ifdef _KERNEL
void ntp_update_second(int64_t *adjustment, time_t *newsec);
_______________________________________________
freebsd-current@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-current
To unsubscribe, send any mail to "freebsd-current-unsubscr...@freebsd.org"
