diff options
| author | dds <dds@FreeBSD.org> | 2006-06-22 13:11:36 +0000 |
|---|---|---|
| committer | dds <dds@FreeBSD.org> | 2006-06-22 13:11:36 +0000 |
| commit | bfe074b2a8d465e6ab047144daba3aceb8111247 (patch) | |
| tree | da1b59e2a516d53b4715b201a301d9fec1e25ee4 /sys/compat | |
| parent | fd67f82de122c10d1ad4cd01b2a89bad62b14884 (diff) | |
| download | FreeBSD-src-bfe074b2a8d465e6ab047144daba3aceb8111247.zip FreeBSD-src-bfe074b2a8d465e6ab047144daba3aceb8111247.tar.gz | |
Move conditional preprocessing out of the SYSCTL_ADD_STRING macro
invocation. Per C99 6.10.3 paragraph 11 preprocessing directives
appearing inside macro arguments yield undefined behavior.
Diffstat (limited to 'sys/compat')
| -rw-r--r-- | sys/compat/ndis/kern_ndis.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/sys/compat/ndis/kern_ndis.c b/sys/compat/ndis/kern_ndis.c index 98f49cf..962f69d 100644 --- a/sys/compat/ndis/kern_ndis.c +++ b/sys/compat/ndis/kern_ndis.c @@ -405,13 +405,16 @@ ndis_add_sysctl(arg, key, desc, val, flag) cfg->ndis_oid = #if __FreeBSD_version < 502113 SYSCTL_ADD_STRING(&sc->ndis_ctx, SYSCTL_CHILDREN(sc->ndis_tree), + OID_AUTO, cfg->ndis_cfg.nc_cfgkey, flag, + cfg->ndis_cfg.nc_val, sizeof(cfg->ndis_cfg.nc_val), + cfg->ndis_cfg.nc_cfgdesc); #else SYSCTL_ADD_STRING(device_get_sysctl_ctx(sc->ndis_dev), SYSCTL_CHILDREN(device_get_sysctl_tree(sc->ndis_dev)), -#endif OID_AUTO, cfg->ndis_cfg.nc_cfgkey, flag, cfg->ndis_cfg.nc_val, sizeof(cfg->ndis_cfg.nc_val), cfg->ndis_cfg.nc_cfgdesc); +#endif return(0); } |
