Thanks for the thoughtful review. I applied this to master.
On Wed, May 10, 2017 at 12:08:29AM +0000, Darrell Ball wrote: > I don’t see the Sparse complaint > > I am using > > dball@ubuntu:~/ovs$ openssl version > OpenSSL 1.0.2g 1 Mar 2016 > dball@ubuntu:~/ovs$ uname -a > Linux ubuntu 4.4.0-75-generic #96-Ubuntu SMP Thu Apr 20 09:56:33 UTC 2017 > x86_64 x86_64 x86_64 GNU/Linux > > The line number quoted in the commit message here > “/usr/include/openssl/e_os2.h:275:12: this was the original definition” > makes no sense for me > > That being said, I cannot see a problem with the proposed change > and since we don’t understand the Sparse complaint, we can either > ignore it or spend more time in the slim hope we can understand it > and it turns out to be useful. > > I think it is better to ignore it > > Acked-by: Darrell Ball <dlu...@gmail.com> > > > > On 5/5/17, 9:39 PM, "ovs-dev-boun...@openvswitch.org on behalf of Ben Pfaff" > <ovs-dev-boun...@openvswitch.org on behalf of b...@ovn.org> wrote: > > This change avoids the following "sparse" warnings: > > /usr/include/inttypes.h:105:10: warning: preprocessor token PRIu64 > redefined > /usr/include/openssl/e_os2.h:275:12: this was the original definition > > With this change, the build is again "sparse" clean. > > I did not look into the details of this particular issue. However, the > upshot is that including <inttypes.h> before any OpenSSL header avoids the > warning and the opposite order provokes it. > > Signed-off-by: Ben Pfaff <b...@ovn.org> > --- > lib/dhparams.h | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/lib/dhparams.h b/lib/dhparams.h > index 54f9c5fbc01b..9bf03e51ed7e 100644 > --- a/lib/dhparams.h > +++ b/lib/dhparams.h > @@ -1,5 +1,5 @@ > /* > - * Copyright (c) 2008 Nicira, Inc. > + * Copyright (c) 2008, 2017 Nicira, Inc. > * > * Licensed under the Apache License, Version 2.0 (the "License"); > * you may not use this file except in compliance with the License. > @@ -17,6 +17,7 @@ > #ifndef DHPARAMS_H > #define DHPARAMS_H 1 > > +#include <inttypes.h> > #include <openssl/dh.h> > > DH *get_dh1024(void); > -- > 2.10.2 > > _______________________________________________ > dev mailing list > d...@openvswitch.org > > https://urldefense.proofpoint.com/v2/url?u=https-3A__mail.openvswitch.org_mailman_listinfo_ovs-2Ddev&d=DwICAg&c=uilaK90D4TOVoH58JNXRgQ&r=BVhFA09CGX7JQ5Ih-uZnsw&m=8bO30Qvgkz6yoS5Af-9gGrNcJcPgq-_wwIOJF8ynpdU&s=pf3zcGbDebqT24IX4YIPYGjLKoe6cNT04fIUw89Z5WU&e= > > > _______________________________________________ dev mailing list d...@openvswitch.org https://mail.openvswitch.org/mailman/listinfo/ovs-dev