[Qemu-devel] [PULL 017/118] libdecnumber: Prepare libdecnumber for QEMU include structure

[Alexander Graf]

From: Tom Musta <address@hidden>

Consistent with other libraries in QEMU, the libdecnumber header files were
placed in include/libdecnumber, separate from the C code.  This is different
from the original libdecnumber source, where they were co-located.

Change the libdecnumber source code so that it reflects this split.  
Specifically,
modify directives of the form:

    #include "xxx.h"

to look like:

    #include "libdecnumber/xxx.h"

Signed-off-by: Tom Musta <address@hidden>
Signed-off-by: Alexander Graf <address@hidden>
---
 include/libdecnumber/decNumber.h      |  2 +-
 include/libdecnumber/decNumberLocal.h |  2 +-
 include/libdecnumber/dpd/decimal128.h |  2 +-
 include/libdecnumber/dpd/decimal32.h  |  2 +-
 include/libdecnumber/dpd/decimal64.h  |  2 +-
 libdecnumber/decContext.c             |  6 +++---
 libdecnumber/decNumber.c              |  6 +++---
 libdecnumber/dpd/decimal128.c         |  8 ++++----
 libdecnumber/dpd/decimal32.c          |  8 ++++----
 libdecnumber/dpd/decimal64.c          | 12 ++++++------
 10 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/include/libdecnumber/decNumber.h b/include/libdecnumber/decNumber.h
index aa99a5b..fb324bd 100644
--- a/include/libdecnumber/decNumber.h
+++ b/include/libdecnumber/decNumber.h
@@ -39,7 +39,7 @@
   #define DECAUTHOR   "Mike Cowlishaw"               /* Who to blame */
 
   #if !defined(DECCONTEXT)
-    #include "decContext.h"
+    #include "libdecnumber/decContext.h"
   #endif
 
   /* Bit settings for decNumber.bits                                 */
diff --git a/include/libdecnumber/decNumberLocal.h 
b/include/libdecnumber/decNumberLocal.h
index f2a919b..f5f508f 100644
--- a/include/libdecnumber/decNumberLocal.h
+++ b/include/libdecnumber/decNumberLocal.h
@@ -44,7 +44,7 @@
 
   #include <stdlib.h>        /* for abs                              */
   #include <string.h>        /* for memset, strcpy                   */
-  #include "dconfig.h"       /* for WORDS_BIGENDIAN                  */
+  #include "libdecnumber/dconfig.h"
 
   /* Conditional code flag -- set this to match hardware platform     */
   /* 1=little-endian, 0=big-endian                                   */
diff --git a/include/libdecnumber/dpd/decimal128.h 
b/include/libdecnumber/dpd/decimal128.h
index 251b964..7d9ee24 100644
--- a/include/libdecnumber/dpd/decimal128.h
+++ b/include/libdecnumber/dpd/decimal128.h
@@ -60,7 +60,7 @@
     #define DECNUMDIGITS DECIMAL128_Pmax /* size if not already defined*/
   #endif
   #ifndef DECNUMBER
-    #include "decNumber.h"             /* context and number library */
+    #include "libdecnumber/decNumber.h"
   #endif
 
   /* Decimal 128-bit type, accessible by bytes                       */
diff --git a/include/libdecnumber/dpd/decimal32.h 
b/include/libdecnumber/dpd/decimal32.h
index 5f06cd4..de313e0 100644
--- a/include/libdecnumber/dpd/decimal32.h
+++ b/include/libdecnumber/dpd/decimal32.h
@@ -60,7 +60,7 @@
     #define DECNUMDIGITS DECIMAL32_Pmax /* size if not already defined*/
   #endif
   #ifndef DECNUMBER
-    #include "decNumber.h"             /* context and number library */
+    #include "libdecnumber/decNumber.h"
   #endif
 
   /* Decimal 32-bit type, accessible by bytes */
diff --git a/include/libdecnumber/dpd/decimal64.h 
b/include/libdecnumber/dpd/decimal64.h
index c391e25..2f6c049 100644
--- a/include/libdecnumber/dpd/decimal64.h
+++ b/include/libdecnumber/dpd/decimal64.h
@@ -62,7 +62,7 @@
     #define DECNUMDIGITS DECIMAL64_Pmax /* size if not already defined*/
   #endif
   #ifndef DECNUMBER
-    #include "decNumber.h"             /* context and number library */
+    #include "libdecnumber/decNumber.h"
   #endif
 
   /* Decimal 64-bit type, accessible by bytes                        */
diff --git a/libdecnumber/decContext.c b/libdecnumber/decContext.c
index 8d577f4..6847106 100644
--- a/libdecnumber/decContext.c
+++ b/libdecnumber/decContext.c
@@ -37,9 +37,9 @@
 
 #include <string.h>          /* for strcmp */
 #include <stdio.h>           /* for printf if DECCHECK */
-#include "dconfig.h"         /* for GCC definitions */
-#include "decContext.h"              /* context and base types */
-#include "decNumberLocal.h"   /* decNumber local types, etc. */
+#include "libdecnumber/dconfig.h"
+#include "libdecnumber/decContext.h"
+#include "libdecnumber/decNumberLocal.h"
 
 #if DECCHECK
 /* compile-time endian tester [assumes sizeof(Int)>1] */
diff --git a/libdecnumber/decNumber.c b/libdecnumber/decNumber.c
index f9a624a..1bfc081 100644
--- a/libdecnumber/decNumber.c
+++ b/libdecnumber/decNumber.c
@@ -170,9 +170,9 @@
 #include <stdio.h>                /* for printf [if needed] */
 #include <string.h>               /* for strcpy */
 #include <ctype.h>                /* for lower */
-#include "dconfig.h"              /* for GCC definitions */
-#include "decNumber.h"            /* base number library */
-#include "decNumberLocal.h"       /* decNumber local types, etc. */
+#include "libdecnumber/dconfig.h"
+#include "libdecnumber/decNumber.h"
+#include "libdecnumber/decNumberLocal.h"
 
 /* Constants */
 /* Public lookup table used by the D2U macro */
diff --git a/libdecnumber/dpd/decimal128.c b/libdecnumber/dpd/decimal128.c
index 54191aa..8f8e983 100644
--- a/libdecnumber/dpd/decimal128.c
+++ b/libdecnumber/dpd/decimal128.c
@@ -42,11 +42,11 @@
 #include <string.h>          /* [for memset/memcpy] */
 #include <stdio.h>           /* [for printf] */
 
-#include "dconfig.h"         /* GCC definitions */
+#include "libdecnumber/dconfig.h"
 #define         DECNUMDIGITS 34      /* make decNumbers with space for 34 */
-#include "decNumber.h"       /* base number library */
-#include "decNumberLocal.h"   /* decNumber local types, etc. */
-#include "decimal128.h"              /* our primary include */
+#include "libdecnumber/decNumber.h"
+#include "libdecnumber/decNumberLocal.h"
+#include "libdecnumber/dpd/decimal128.h"
 
 /* Utility routines and tables [in decimal64.c] */
 extern const uInt   COMBEXP[32], COMBMSD[32];
diff --git a/libdecnumber/dpd/decimal32.c b/libdecnumber/dpd/decimal32.c
index d8e3f59..f8d30e6 100644
--- a/libdecnumber/dpd/decimal32.c
+++ b/libdecnumber/dpd/decimal32.c
@@ -42,11 +42,11 @@
 #include <string.h>          /* [for memset/memcpy] */
 #include <stdio.h>           /* [for printf] */
 
-#include "dconfig.h"         /* GCC definitions */
+#include "libdecnumber/dconfig.h"
 #define         DECNUMDIGITS  7      /* make decNumbers with space for 7 */
-#include "decNumber.h"       /* base number library */
-#include "decNumberLocal.h"   /* decNumber local types, etc. */
-#include "decimal32.h"       /* our primary include */
+#include "libdecnumber/decNumber.h"
+#include "libdecnumber/decNumberLocal.h"
+#include "libdecnumber/dpd/decimal32.h"
 
 /* Utility tables and routines [in decimal64.c] */
 extern const uInt   COMBEXP[32], COMBMSD[32];
diff --git a/libdecnumber/dpd/decimal64.c b/libdecnumber/dpd/decimal64.c
index 474eb7c..3bd2776 100644
--- a/libdecnumber/dpd/decimal64.c
+++ b/libdecnumber/dpd/decimal64.c
@@ -42,11 +42,11 @@
 #include <string.h>          /* [for memset/memcpy] */
 #include <stdio.h>           /* [for printf] */
 
-#include "dconfig.h"         /* GCC definitions */
+#include "libdecnumber/dconfig.h"
 #define         DECNUMDIGITS 16      /* make decNumbers with space for 16 */
-#include "decNumber.h"       /* base number library */
-#include "decNumberLocal.h"   /* decNumber local types, etc. */
-#include "decimal64.h"       /* our primary include */
+#include "libdecnumber/decNumber.h"
+#include "libdecnumber/decNumberLocal.h"
+#include "libdecnumber/dpd/decimal64.h"
 
 /* Utility routines and tables [in decimal64.c]; externs for C++ */
 extern const uInt COMBEXP[32], COMBMSD[32];
@@ -70,7 +70,7 @@ extern void decNumberShow(const decNumber *);   /* .. */
 #define DEC_BIN2CHAR 1
 #define DEC_DPD2BIN  1
 #define DEC_BIN2DPD  1            /* used for all sizes */
-#include "decDPD.h"               /* lookup tables */
+#include "libdecnumber/decDPD.h"
 
 /* ------------------------------------------------------------------ */
 /* decimal64FromNumber -- convert decNumber to decimal64             */
@@ -559,7 +559,7 @@ void decimal64Show(const decimal64 *d64) {
 #else
   #define DEC_DPD2BCD 1
 #endif
-#include "decDPD.h"          /* lookup tables */
+#include "libdecnumber/decDPD.h"
 
 /* The maximum number of decNumberUnits needed for a working copy of */
 /* the units array is the ceiling of digits/DECDPUN, where digits is */
-- 
1.8.1.4