merge trunk into branch rootsunityrootsunity

git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/mpc/branches/rootsunity@1273 211d60ee-9f03-0410-a15a-8952a2c7a4e4

1 files changed, 2 insertions, 23 deletions

diff --git a/src/get_version.c b/src/get_version.c
index 1c429c0..e3b95a1 100644
--- a/src/get_version.c
+++ b/src/get_version.c
@@ -1,6 +1,6 @@
 /* mpc_get_version -- MPC version
 
-Copyright (C) 2008, 2009, 2010, 2011 INRIA
+Copyright (C) 2008, 2009, 2010, 2011, 2012 INRIA
 
 This file is part of GNU MPC.
 
@@ -20,29 +20,8 @@ along with this program. If not, see http://www.gnu.org/licenses/ .
 
 #include "mpc-impl.h"
 
-#if MPFR_VERSION_MAJOR < 3
-/* The following are functions defined for compatibility with mpfr < 3;
-   logically, they should be defined in a separate file, but then gcc
-   complains about an empty translation unit with mpfr >= 3.            */
-
-void
-mpfr_set_zero (mpfr_ptr z, int s)
-{
-   mpfr_set_ui (z, 0ul, GMP_RNDN);
-   if (s < 0)
-      mpfr_neg (z, z, GMP_RNDN);
-}
-
-int
-mpfr_regular_p (mpfr_srcptr z)
-{
-   return (mpfr_number_p (z) && !mpfr_zero_p (z));
-}
-#endif /* mpfr < 3 */
-
-
 const char *
 mpc_get_version (void)
 {
-  return "1.0.0dev";
+  return "1.1dev";
 }