merge from gcc

6 files changed, 30 insertions, 12 deletions

diff --git a/libdecnumber/dpd/decimal128.c b/libdecnumber/dpd/decimal128.c
index 6aa98b5..0e32ceb 100644
--- a/libdecnumber/dpd/decimal128.c
+++ b/libdecnumber/dpd/decimal128.c
@@ -49,10 +49,6 @@
 #include "decimal128.h"	      /* our primary include */
 
 /* Utility routines and tables [in decimal64.c] */
-/* DPD2BIN and the reverse are renamed to prevent link-time conflict */
-/* if decQuad is also built in the same executable */
-#define DPD2BIN DPD2BINx
-#define BIN2DPD BIN2DPDx
 extern const uInt   COMBEXP[32], COMBMSD[32];
 extern const uShort DPD2BIN[1024];
 extern const uShort BIN2DPD[1000];	/* [not used] */
diff --git a/libdecnumber/dpd/decimal128Symbols.h b/libdecnumber/dpd/decimal128Symbols.h
index da9d76b..b30687c 100644
--- a/libdecnumber/dpd/decimal128Symbols.h
+++ b/libdecnumber/dpd/decimal128Symbols.h
@@ -11,6 +11,16 @@
 #define decimal128ToEngString __decimal128ToEngString
 #define decimal128ToNumber __decimal128ToNumber
 #define decimal128ToString __decimal128ToString
+#define COMBEXP __decnnCOMBEXP
+#define COMBMSD __decnnCOMBMSD
+
+/* DPD2BIN and BIN2DPD are used in support for decimal32/decimal64/decimal128
+   and also in support for decSingle/decDouble/decQuad.  Rename them in case
+   both types of support are used in the same executable.  */
+#undef DPD2BIN
+#define DPD2BIN __decnnDPD2BIN
+#undef BIN2DPD
+#define BIN2DPD __decnnBIN2DPD
 #endif
 
 #endif
diff --git a/libdecnumber/dpd/decimal32.c b/libdecnumber/dpd/decimal32.c
index 692c2f7..42bddf1 100644
--- a/libdecnumber/dpd/decimal32.c
+++ b/libdecnumber/dpd/decimal32.c
@@ -49,10 +49,6 @@
 #include "decimal32.h"	      /* our primary include */
 
 /* Utility tables and routines [in decimal64.c] */
-/* DPD2BIN and the reverse are renamed to prevent link-time conflict */
-/* if decQuad is also built in the same executable */
-#define DPD2BIN DPD2BINx
-#define BIN2DPD BIN2DPDx
 extern const uInt   COMBEXP[32], COMBMSD[32];
 extern const uShort DPD2BIN[1024];
 extern const uShort BIN2DPD[1000];
diff --git a/libdecnumber/dpd/decimal32Symbols.h b/libdecnumber/dpd/decimal32Symbols.h
index de11934..c4aa74f 100644
--- a/libdecnumber/dpd/decimal32Symbols.h
+++ b/libdecnumber/dpd/decimal32Symbols.h
@@ -11,6 +11,16 @@
 #define decimal32ToEngString __decimal32ToEngString
 #define decimal32ToNumber __decimal32ToNumber
 #define decimal32ToString __decimal32ToString
+#define COMBEXP __decnnCOMBEXP
+#define COMBMSD __decnnCOMBMSD
+
+/* DPD2BIN and BIN2DPD are used in support for decimal32/decimal64/decimal128
+   and also in support for decSingle/decDouble/decQuad.  Rename them in case
+   both types of support are used in the same executable.  */
+#undef DPD2BIN
+#define DPD2BIN __decnnDPD2BIN
+#undef BIN2DPD
+#define BIN2DPD __decnnBIN2DPD
 #endif
 
 #endif
diff --git a/libdecnumber/dpd/decimal64.c b/libdecnumber/dpd/decimal64.c
index 359214e..c3617c4 100644
--- a/libdecnumber/dpd/decimal64.c
+++ b/libdecnumber/dpd/decimal64.c
@@ -49,10 +49,6 @@
 #include "decimal64.h"	      /* our primary include */
 
 /* Utility routines and tables [in decimal64.c]; externs for C++ */
-/* DPD2BIN and the reverse are renamed to prevent link-time conflict */
-/* if decQuad is also built in the same executable */
-#define DPD2BIN DPD2BINx
-#define BIN2DPD BIN2DPDx
 extern const uInt COMBEXP[32], COMBMSD[32];
 extern const uShort DPD2BIN[1024];
 extern const uShort BIN2DPD[1000];
diff --git a/libdecnumber/dpd/decimal64Symbols.h b/libdecnumber/dpd/decimal64Symbols.h
index cf965bf..efb6446 100644
--- a/libdecnumber/dpd/decimal64Symbols.h
+++ b/libdecnumber/dpd/decimal64Symbols.h
@@ -11,6 +11,16 @@
 #define decimal64ToEngString __decimal64ToEngString
 #define decimal64ToNumber __decimal64ToNumber
 #define decimal64ToString __decimal64ToString
+#define COMBEXP __decnnCOMBEXP
+#define COMBMSD __decnnCOMBMSD
+
+/* DPD2BIN and BIN2DPD are used in support for decimal32/decimal64/decimal128
+   and also in support for decSingle/decDouble/decQuad.  Rename them in case
+   both types of support are used in the same executable.  */
+#undef DPD2BIN
+#define DPD2BIN __decnnDPD2BIN
+#undef BIN2DPD
+#define BIN2DPD __decnnBIN2DPD
 #endif
 
 #endif