On Wed, Sep 22, 2010 at 02:17:48PM -0600, Eric Blake wrote:
On 09/17/2010 10:29 AM, Adam Stokes wrote:
> ---
> src/drv_initscripts.c | 2 +-
> src/internal.h | 3 ++
> src/ncftool.c | 7 ++++++
> src/netcf.c | 54 ++++++++++++++++++++++++++++++++++++++++++++++++-
> src/xslt_ext.c | 2 +-
> 5 files changed, 65 insertions(+), 3 deletions(-)
>
> diff --git a/src/drv_initscripts.c b/src/drv_initscripts.c
> index c0bcfd5..2127d2a 100644
> --- a/src/drv_initscripts.c
> +++ b/src/drv_initscripts.c
> @@ -100,7 +100,7 @@ static const struct augeas_xfm_table augeas_xfm_iptables =
>
> static const char *const prog_lokkit = "/usr/sbin/lokkit";
> static const char *const lokkit_custom_rules =
> - "--custom-rules=ipv4:filter:" DATADIR
"/netcf/iptables-forward-bridged";
> + "--custom-rules=ipv4:filter:" NETCF_DATADIR
"/netcf/iptables-forward-bridged";
I still don't see why you had to do this rename. A commit comment
explaining why would be great, and it may be possible to do things
without a rename.
Win32 header files already have something called DATADIR defined :-(
Daniel
--
|: Red Hat, Engineering, London -o-
http://people.redhat.com/berrange/ :|
|:
http://libvirt.org -o-
http://virt-manager.org -o-
http://deltacloud.org :|
|:
http://autobuild.org -o-
http://search.cpan.org/~danberr/ :|
|: GnuPG: 7D3B9505 -o- F3C9 553F A1DA 4AC2 5648 23C1 B3DF F742 7D3B 9505 :|