[Qemu-devel] [PATCH 14/18] libdecnumber: Don't fool around with guards to avoid #include

[Markus Armbruster]

Some libdecnumber headers avoid including decNumber.h or decContext.h
again by checking their header guards.  Don't.  Including them
multiple times is safe, and the compiler can do it efficiently.

Signed-off-by: Markus Armbruster <arm...@redhat.com>
---
 include/libdecnumber/decNumber.h      | 4 +---
 include/libdecnumber/dpd/decimal128.h | 4 +---
 include/libdecnumber/dpd/decimal32.h  | 4 +---
 include/libdecnumber/dpd/decimal64.h  | 4 +---
 4 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/include/libdecnumber/decNumber.h b/include/libdecnumber/decNumber.h
index 9fa4e6a..3f3a74a 100644
--- a/include/libdecnumber/decNumber.h
+++ b/include/libdecnumber/decNumber.h
@@ -38,9 +38,7 @@
   #define DECFULLNAME "Decimal Number Module"        /* Verbose name */
   #define DECAUTHOR   "Mike Cowlishaw"               /* Who to blame */
 
-  #if !defined(DECCONTEXT)
-    #include "libdecnumber/decContext.h"
-  #endif
+  #include "libdecnumber/decContext.h"
 
   /* Bit settings for decNumber.bits                                 */
   #define DECNEG    0x80      /* Sign; 1=negative, 0=positive or zero */
diff --git a/include/libdecnumber/dpd/decimal128.h 
b/include/libdecnumber/dpd/decimal128.h
index 7d9ee24..13d1ae8 100644
--- a/include/libdecnumber/dpd/decimal128.h
+++ b/include/libdecnumber/dpd/decimal128.h
@@ -59,9 +59,7 @@
   #ifndef DECNUMDIGITS
     #define DECNUMDIGITS DECIMAL128_Pmax /* size if not already defined*/
   #endif
-  #ifndef DECNUMBER
-    #include "libdecnumber/decNumber.h"
-  #endif
+  #include "libdecnumber/decNumber.h"
 
   /* Decimal 128-bit type, accessible by bytes                       */
   typedef struct {
diff --git a/include/libdecnumber/dpd/decimal32.h 
b/include/libdecnumber/dpd/decimal32.h
index de313e0..03c80db 100644
--- a/include/libdecnumber/dpd/decimal32.h
+++ b/include/libdecnumber/dpd/decimal32.h
@@ -59,9 +59,7 @@
   #ifndef DECNUMDIGITS
     #define DECNUMDIGITS DECIMAL32_Pmax /* size if not already defined*/
   #endif
-  #ifndef DECNUMBER
-    #include "libdecnumber/decNumber.h"
-  #endif
+  #include "libdecnumber/decNumber.h"
 
   /* Decimal 32-bit type, accessible by bytes */
   typedef struct {
diff --git a/include/libdecnumber/dpd/decimal64.h 
b/include/libdecnumber/dpd/decimal64.h
index 2f6c049..a375faf 100644
--- a/include/libdecnumber/dpd/decimal64.h
+++ b/include/libdecnumber/dpd/decimal64.h
@@ -61,9 +61,7 @@
   #ifndef DECNUMDIGITS
     #define DECNUMDIGITS DECIMAL64_Pmax /* size if not already defined*/
   #endif
-  #ifndef DECNUMBER
-    #include "libdecnumber/decNumber.h"
-  #endif
+  #include "libdecnumber/decNumber.h"
 
   /* Decimal 64-bit type, accessible by bytes                        */
   typedef struct {
-- 
2.5.5