From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 22994 invoked by alias); 16 Jan 2008 14:17:24 -0000 Received: (qmail 22924 invoked by uid 22791); 16 Jan 2008 14:17:22 -0000 X-Spam-Check-By: sourceware.org Received: from server7.nfra.nl (HELO server7.nfra.nl) (192.87.1.57) by sourceware.org (qpsmtpd/0.31) with ESMTP; Wed, 16 Jan 2008 14:16:32 +0000 Received: from jop31.nfra.nl ([10.87.10.31]) by server7.nfra.nl with ESMTP; Wed, 16 Jan 2008 15:16:11 +0100 Received: from jop31.nfra.nl (localhost [127.0.0.1]) by jop31.nfra.nl (8.13.1/8.12.7/SuSE Linux 0.6) with ESMTP id m0GEG99q020648 for ; Wed, 16 Jan 2008 15:16:09 +0100 Received: (from kettenis@localhost) by jop31.nfra.nl (8.13.1/8.13.1/Submit) id m0GEG9bs020645; Wed, 16 Jan 2008 15:16:09 +0100 Date: Wed, 16 Jan 2008 14:17:00 -0000 Message-Id: <200801161416.m0GEG9bs020645@jop31.nfra.nl> From: Mark Kettenis To: gdb-patches@sourceware.org Subject: [RFA] Rename decimal_to_double Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org X-SW-Source: 2008-01/txt/msg00404.txt.bz2 This function conflicts with a system function on Solaris: In file included from /usr/sfw/lib/gcc/i386-pc-solaris2.10/3.4.3/include/math.h:332, from ../../../src/gdb/gdb/valarith.c:32: /usr/include/floatingpoint.h:150: error: conflicting types for 'decimal_to_double' ./../../src/gdb/gdb/dfp.h:36: error: previous declaration of 'decimal_to_double' was here /usr/include/floatingpoint.h:150: error: conflicting types for 'decimal_to_double' ./../../src/gdb/gdb/dfp.h:36: error: previous declaration of 'decimal_to_double' was here The attached patch renames the function to decimal_to_doublest to avoid the collision. ok? 2008-01-16 Mark Kettenis * dfp.c, dfp.h: Rename decimal_to_double to decimal_to_doublest. * value.c: All callers changed. Index: dfp.c =================================================================== RCS file: /cvs/src/src/gdb/dfp.c,v retrieving revision 1.5 diff -u -p -r1.5 dfp.c --- dfp.c 9 Jan 2008 19:27:15 -0000 1.5 +++ dfp.c 16 Jan 2008 14:10:42 -0000 @@ -249,7 +249,7 @@ decimal_from_floating (struct value *fro /* Converts a decimal float of LEN bytes to a double value. */ DOUBLEST -decimal_to_double (const gdb_byte *from, int len) +decimal_to_doublest (const gdb_byte *from, int len) { char buffer[MAX_DECIMAL_STRING]; Index: dfp.h =================================================================== RCS file: /cvs/src/src/gdb/dfp.h,v retrieving revision 1.3 diff -u -p -r1.3 dfp.h --- dfp.h 7 Jan 2008 22:33:57 -0000 1.3 +++ dfp.h 16 Jan 2008 14:10:42 -0000 @@ -33,7 +33,7 @@ extern void decimal_to_string (const gdb extern int decimal_from_string (gdb_byte *, int, const char *); extern void decimal_from_integral (struct value *from, gdb_byte *to, int len); extern void decimal_from_floating (struct value *from, gdb_byte *to, int len); -extern DOUBLEST decimal_to_double (const gdb_byte *from, int len); +extern DOUBLEST decimal_to_doublest (const gdb_byte *from, int len); extern void decimal_binop (enum exp_opcode, const gdb_byte *, int, const gdb_byte *, int, gdb_byte *, int *); extern int decimal_is_zero (const gdb_byte *x, int len); Index: value.c =================================================================== RCS file: /cvs/src/src/gdb/value.c,v retrieving revision 1.55 diff -u -p -r1.55 value.c --- value.c 7 Jan 2008 22:33:57 -0000 1.55 +++ value.c 16 Jan 2008 14:10:42 -0000 @@ -1131,7 +1131,7 @@ unpack_long (struct type *type, const gd case TYPE_CODE_DECFLOAT: /* libdecnumber has a function to convert from decimal to integer, but it doesn't work when the decimal number has a fractional part. */ - return decimal_to_double (valaddr, len); + return decimal_to_doublest (valaddr, len); case TYPE_CODE_PTR: case TYPE_CODE_REF: @@ -1191,7 +1191,7 @@ unpack_double (struct type *type, const return extract_typed_floating (valaddr, type); } else if (code == TYPE_CODE_DECFLOAT) - return decimal_to_double (valaddr, len); + return decimal_to_doublest (valaddr, len); else if (nosign) { /* Unsigned -- be sure we compensate for signed LONGEST. */