On 06/24/2011 01:48 PM, Matthias Bolte wrote: > 2011/6/24 Eric Blake <eblake@xxxxxxxxxx>: >> Done as a separate commit to make backporting the next patch easier. >> >> * .gnulib: Update, for syntax-check fix. >> --- >> >> If anyone needs to backport the next patch, it will be easier to >> add an appropriate INT_MULTIPLY_OVERFLOW macro in "internal.h" than >> to do a gnulib update, so I've separated these two tasks. >> >> .gnulib | 2 +- >> 1 files changed, 1 insertions(+), 1 deletions(-) >> >> diff --git a/.gnulib b/.gnulib >> index 478c2dc..25e4c2e 160000 >> --- a/.gnulib >> +++ b/.gnulib >> @@ -1 +1 @@ >> -Subproject commit 478c2dcc839e5f4765e6417684ce414e2d4973a8 >> +Subproject commit 25e4c2ec96602d132ad4429d6eaebaea1a8f504b >> -- >> 1.7.4.4 > > ACK. Thanks; pushed. Here's the gnulib changes: * .gnulib 478c2dc...25e4c2e (3): > maint.mk: update sc_prohibit_intprops_without_use > strerror-override: No-op tweak. > autoupdate Also, I squashed this in, based on your comments on 2/2: diff --git a/bootstrap.conf b/bootstrap.conf index 769e57c..7b2cd60 100644 --- a/bootstrap.conf +++ b/bootstrap.conf @@ -46,6 +46,7 @@ gitlog-to-changelog gnumakefile ignore-value inet_pton +intprops ioctl maintainer-makefile manywarnings diff --git a/src/locking/domain_lock.c b/src/locking/domain_lock.c index feb3f98..dd9683c 100644 --- a/src/locking/domain_lock.c +++ b/src/locking/domain_lock.c @@ -21,8 +21,7 @@ #include <config.h> -#include <intprops.h> - +#include "intprops.h" #include "domain_lock.h" #include "memory.h" #include "uuid.h" diff --git a/src/nwfilter/nwfilter_learnipaddr.c b/src/nwfilter/nwfilter_learnipaddr.c index ce845ac..cf818a2 100644 --- a/src/nwfilter/nwfilter_learnipaddr.c +++ b/src/nwfilter/nwfilter_learnipaddr.c @@ -37,10 +37,10 @@ #include <netinet/ip.h> #include <netinet/udp.h> #include <net/if_arp.h> -#include <intprops.h> #include "internal.h" +#include "intprops.h" #include "buf.h" #include "memory.h" #include "logging.h" -- 1.7.4.4 -- Eric Blake eblake@xxxxxxxxxx +1-801-349-2682 Libvirt virtualization library http://libvirt.org
Attachment:
signature.asc
Description: OpenPGP digital signature
-- libvir-list mailing list libvir-list@xxxxxxxxxx https://www.redhat.com/mailman/listinfo/libvir-list