From 7bd5e887bd93278684627e88d5f54337e4410ff8 Mon Sep 17 00:00:00 2001 From: Werner LEMBERG Date: Fri, 18 Mar 2005 07:00:51 +0000 Subject: [PATCH] * src/libs/libgroff/hypot.c: Renamed to... * src/libs/libgroff/hypot.cpp: This. Updated to C++. * src/libs/libgroff/Makefile.sub (CCSRCS, CSRCS): Updated. --- ChangeLog | 5 +++++ src/libs/libgroff/Makefile.sub | 2 +- src/libs/libgroff/{hypot.c => hypot.cpp} | 8 -------- 3 files changed, 6 insertions(+), 9 deletions(-) rename src/libs/libgroff/{hypot.c => hypot.cpp} (94%) diff --git a/ChangeLog b/ChangeLog index 23a509ab..3b4f5231 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,11 @@ * doc/Makefile.sub (CLEANADD): Add `groff.html'. + * src/libs/libgroff/hypot.c: Renamed to... + * src/libs/libgroff/hypot.cpp: This. Updated to C++. + + * src/libs/libgroff/Makefile.sub (CCSRCS, CSRCS): Updated. + 2005-03-16 Werner LEMBERG Add workaround for broken hypot() on Interix. diff --git a/src/libs/libgroff/Makefile.sub b/src/libs/libgroff/Makefile.sub index fc55f086..b4233497 100644 --- a/src/libs/libgroff/Makefile.sub +++ b/src/libs/libgroff/Makefile.sub @@ -62,6 +62,7 @@ CCSRCS=\ $(srcdir)/geometry.cpp \ $(srcdir)/glyphuni.cpp \ $(srcdir)/htmlhint.cpp \ + $(srcdir)/hypot.cpp \ $(srcdir)/invalid.cpp \ $(srcdir)/lf.cpp \ $(srcdir)/lineno.cpp \ @@ -89,7 +90,6 @@ CSRCS=\ $(srcdir)/getcwd.c \ $(srcdir)/getopt.c \ $(srcdir)/getopt1.c \ - $(srcdir)/hypot.c \ $(srcdir)/iftoa.c \ $(srcdir)/itoa.c \ $(srcdir)/matherr.c \ diff --git a/src/libs/libgroff/hypot.c b/src/libs/libgroff/hypot.cpp similarity index 94% rename from src/libs/libgroff/hypot.c rename to src/libs/libgroff/hypot.cpp index f45ab2cf..6d2606d8 100644 --- a/src/libs/libgroff/hypot.c +++ b/src/libs/libgroff/hypot.cpp @@ -22,10 +22,6 @@ Cambridge, MA 02139, USA. */ #include -#ifdef __cplusplus -extern "C" { -#endif - #ifdef NEED_DECLARATION_HYPOT double hypot(double, double); #endif /* NEED_DECLARATION_HYPOT */ @@ -42,7 +38,3 @@ double groff_hypot(double x, double y) return result; } - -#ifdef __cplusplus -} -#endif -- 2.11.4.GIT