Changeset 68b4d3 in git

Timestamp:

Oct 28, 2013, 9:52:43 AM (9 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', 'ad2543eab51733612ba7d118afc77edca719600e')

Children:

b19f81dea5dc1029caf194b9f57389fd6a9f66a3

Parents:

6aee8f3596288969a7c2be2063263a666f4fbe08

git-author:

Hans Schoenemann <hannes@mathematik.uni-kl.de>2013-10-28 09:52:43+01:00

git-committer:

Hans Schoenemann <hannes@mathematik.uni-kl.de>2013-10-28 09:53:31+01:00

Message:

porting: gfanlib and gmp 4.0/4.1 (redhat)

Files:

• configure.ac (modified) (1 diff)
• gfanlib/configure.ac (modified) (1 diff)
• gfanlib/gfanlib_q.h (modified) (1 diff)
• gfanlib/gfanlib_z.h (modified) (1 diff)

configure.ac

@@ -60 +60 @@
 AC_CHECK_LIB(pthread,pthread_create)
 
-LB_CHECK_GMP(4.2,,AC_MSG_ERROR([Unable to find GMP on your machine: please use --with-gmp=PATH_TO_DIR_CONTAINING_LIB_AND_INCLUDE (see also ./configure --help if you do not understand what we are talking about)]))
+LB_CHECK_GMP(4.0,,AC_MSG_ERROR([Unable to find GMP on your machine: please use --with-gmp=PATH_TO_DIR_CONTAINING_LIB_AND_INCLUDE (see also ./configure --help if you do not understand what we are talking about)]))
 LB_CHECK_NTL(5.0,,AC_MSG_WARN([Unable to find NTL (which is strongly recommended) on your machine: please use --with-ntl=PATH_TO_DIR_CONTAINING_LIB_AND_INCLUDE (see also ./configure --help if you do not understand what we are talking about)]))
 LB_CHECK_FLINT(2.3,,AC_MSG_WARN([Unable to find FLINT (which is strongly recommended) on your machine: please use --with-flint=PATH_TO_DIR_CONTAINING_LIB_AND_INCLUDE (see also ./configure --help if you do not understand what we are talking about)]))

gfanlib/configure.ac

@@ -30 +30 @@
 AC_HEADER_STDC
 
-LB_CHECK_GMP(3.1.1,,AC_MSG_ERROR([Unable to find GMP on your machine: please use --with-gmp=PATH_TO_DIR_CONTAINING_LIB_AND_INCLUDE (see also ./configure --help if you do not understand what we are talking about)]))
+LB_CHECK_GMP(4.0,,AC_MSG_ERROR([Unable to find GMP on your machine: please use --with-gmp=PATH_TO_DIR_CONTAINING_LIB_AND_INCLUDE (see also ./configure --help if you do not understand what we are talking about)]))
 SING_CHECK_GFANLIB
 

gfanlib/gfanlib_q.h

@@ -12 +12 @@
 #include <ostream>
 #include "gmp.h"
+
+#if (__GNU_MP_VERSION == 4) && (__GNU_MP_VERSION_MINOR<2)
+extern void *  (*__gmp_allocate_func) _PROTO ((size_t));
+extern void *  (*__gmp_reallocate_func) _PROTO ((void *, size_t, size_t));
+extern void    (*__gmp_free_func) _PROTO ((void *, size_t));
+
+static inline void
+mp_get_memory_functions (void *(**alloc_func) (size_t),
+                         void *(**realloc_func) (void *, size_t, size_t),
+                         void (**free_func) (void *, size_t))
+{
+  if (alloc_func != NULL)
+    *alloc_func = __gmp_allocate_func;
+
+  if (realloc_func != NULL)
+    *realloc_func = __gmp_reallocate_func;
+
+  if (free_func != NULL)
+    *free_func = __gmp_free_func;
+}
+#endif
 
 #include "gfanlib_z.h"

gfanlib/gfanlib_z.h

@@ -15 +15 @@
 #if OLD
 #include "gmp.h"
+
+#if (__GNU_MP_VERSION == 4) && (__GNU_MP_VERSION_MINOR<2)
+extern void *  (*__gmp_allocate_func) _PROTO ((size_t));
+extern void *  (*__gmp_reallocate_func) _PROTO ((void *, size_t, size_t));
+extern void    (*__gmp_free_func) _PROTO ((void *, size_t));
+
+static inline void
+mp_get_memory_functions (void *(**alloc_func) (size_t),
+                         void *(**realloc_func) (void *, size_t, size_t),
+                         void (**free_func) (void *, size_t))
+{
+  if (alloc_func != NULL)
+    *alloc_func = __gmp_allocate_func;
+
+  if (realloc_func != NULL)
+    *realloc_func = __gmp_reallocate_func;
+
+  if (free_func != NULL)
+    *free_func = __gmp_free_func;
+}
+#endif
 
 namespace gfan{