From 60413c457f4d4b381843d6a89c6be865f2cf990d Mon Sep 17 00:00:00 2001 From: DJ Delorie Date: Mon, 1 Jun 2009 19:40:32 +0000 Subject: merge from gcc --- libdecnumber/ChangeLog | 9 +++++++++ libdecnumber/decContext.h | 8 ++++++++ libdecnumber/decDPD.h | 8 ++++++++ libdecnumber/decNumber.h | 8 ++++++++ libdecnumber/dpd/decimal128.h | 8 ++++++++ libdecnumber/dpd/decimal32.h | 8 ++++++++ libdecnumber/dpd/decimal64.h | 8 ++++++++ 7 files changed, 57 insertions(+) (limited to 'libdecnumber') diff --git a/libdecnumber/ChangeLog b/libdecnumber/ChangeLog index 12e21554698..74fba5990d6 100644 --- a/libdecnumber/ChangeLog +++ b/libdecnumber/ChangeLog @@ -1,3 +1,12 @@ +2009-05-31 Ian Lance Taylor + + * decContext.h: Add extern "C" if compiling with C++. + * decDPD.h: Likewise. + * decNumber.h: Likewise. + * dpd/decimal32.h: Likewise. + * dpd/decimal64.h: Likewise. + * dpd/decimal128.h: Likewise. + 2009-04-09 Nick Clifton * decRound.c: Change copyright header to refer to version 3 of diff --git a/libdecnumber/decContext.h b/libdecnumber/decContext.h index d6c75f12471..ae0ca07b859 100644 --- a/libdecnumber/decContext.h +++ b/libdecnumber/decContext.h @@ -245,6 +245,10 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see #include "decContextSymbols.h" + #ifdef __cplusplus + extern "C" { + #endif + extern decContext * decContextClearStatus(decContext *, uint32_t); extern decContext * decContextDefault(decContext *, int32_t); extern enum rounding decContextGetRounding(decContext *); @@ -262,4 +266,8 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see extern uint32_t decContextTestStatus(decContext *, uint32_t); extern decContext * decContextZeroStatus(decContext *); + #ifdef __cplusplus + } + #endif + #endif diff --git a/libdecnumber/decDPD.h b/libdecnumber/decDPD.h index 3b998d10043..db4d3434d03 100644 --- a/libdecnumber/decDPD.h +++ b/libdecnumber/decDPD.h @@ -59,6 +59,10 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see #if defined(DEC_BCD2DPD) && DEC_BCD2DPD==1 && !defined(DECBCD2DPD) #define DECBCD2DPD +#ifdef __cplusplus +extern "C" { +#endif + const uint16_t BCD2DPD[2458]={ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 0, 0, 0, 0, 0, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 0, 0, 0, 0, 0, 0, 32, 33, @@ -1206,5 +1210,9 @@ const uint8_t BIN2BCD8[4000]={ 9,8,1,3, 9,8,2,3, 9,8,3,3, 9,8,4,3, 9,8,5,3, 9,8,6,3, 9,8,7,3, 9,8,8,3, 9,8,9,3, 9,9,0,3, 9,9,1,3, 9,9,2,3, 9,9,3,3, 9,9,4,3, 9,9,5,3, 9,9,6,3, 9,9,7,3, 9,9,8,3, 9,9,9,3}; + +#ifdef __cplusplus +} #endif +#endif diff --git a/libdecnumber/decNumber.h b/libdecnumber/decNumber.h index 73a2fd033e9..05ccb9fdf56 100644 --- a/libdecnumber/decNumber.h +++ b/libdecnumber/decNumber.h @@ -108,6 +108,10 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see #include "decNumberSymbols.h" + #ifdef __cplusplus + extern "C" { + #endif + /* Conversions */ decNumber * decNumberFromInt32(decNumber *, int32_t); decNumber * decNumberFromUInt32(decNumber *, uint32_t); @@ -192,4 +196,8 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see && (((dn)->bits&DECSPECIAL)==0)) #define decNumberRadix(dn) (10) + #ifdef __cplusplus + } + #endif + #endif diff --git a/libdecnumber/dpd/decimal128.h b/libdecnumber/dpd/decimal128.h index 5214373cd1d..3c83c81fcaa 100644 --- a/libdecnumber/dpd/decimal128.h +++ b/libdecnumber/dpd/decimal128.h @@ -79,6 +79,10 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see #include "decimal128Symbols.h" + #ifdef __cplusplus + extern "C" { + #endif + /* String conversions */ decimal128 * decimal128FromString(decimal128 *, const char *, decContext *); char * decimal128ToString(const decimal128 *, char *); @@ -93,4 +97,8 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see uint32_t decimal128IsCanonical(const decimal128 *); decimal128 * decimal128Canonical(decimal128 *, const decimal128 *); + #ifdef __cplusplus + } + #endif + #endif diff --git a/libdecnumber/dpd/decimal32.h b/libdecnumber/dpd/decimal32.h index ced33efc1f3..94ddeb80f3f 100644 --- a/libdecnumber/dpd/decimal32.h +++ b/libdecnumber/dpd/decimal32.h @@ -77,6 +77,10 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see #include "decimal32Symbols.h" + #ifdef __cplusplus + extern "C" { + #endif + /* String conversions */ decimal32 * decimal32FromString(decimal32 *, const char *, decContext *); char * decimal32ToString(const decimal32 *, char *); @@ -91,4 +95,8 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see uint32_t decimal32IsCanonical(const decimal32 *); decimal32 * decimal32Canonical(decimal32 *, const decimal32 *); + #ifdef __cplusplus + } + #endif + #endif diff --git a/libdecnumber/dpd/decimal64.h b/libdecnumber/dpd/decimal64.h index a55a9c42906..c501415381e 100644 --- a/libdecnumber/dpd/decimal64.h +++ b/libdecnumber/dpd/decimal64.h @@ -79,6 +79,10 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see #include "decimal64Symbols.h" + #ifdef __cplusplus + extern "C" { + #endif + /* String conversions */ decimal64 * decimal64FromString(decimal64 *, const char *, decContext *); char * decimal64ToString(const decimal64 *, char *); @@ -93,4 +97,8 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see uint32_t decimal64IsCanonical(const decimal64 *); decimal64 * decimal64Canonical(decimal64 *, const decimal64 *); + #ifdef __cplusplus + } + #endif + #endif -- cgit v1.2.1