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 <[email protected]>
---
 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
[email protected]
https://mail.openvswitch.org/mailman/listinfo/ovs-dev

Reply via email to