diff options
| author | enge <enge@211d60ee-9f03-0410-a15a-8952a2c7a4e4> | 2011-05-09 10:08:21 +0000 |
|---|---|---|
| committer | enge <enge@211d60ee-9f03-0410-a15a-8952a2c7a4e4> | 2011-05-09 10:08:21 +0000 |
| commit | ccc59afa1380014bacea6da4c904a85a44e4dd23 (patch) | |
| tree | 621f4f3f67ddc6cda03210d3599f2b1fc619a1ec | |
| parent | 5847591604b010276119fe8faa9aec44f14d3248 (diff) | |
| download | mpc-ccc59afa1380014bacea6da4c904a85a44e4dd23.tar.gz | |
set_x_x.c: replace #if by #ifdef
mpc.h: readded macro _MPC_H_HAVE_INTMAX_T, removed in r973,
which is actually used in set_x,c and set_x_x.c
mpc.m4: improved message
git-svn-id: svn://scm.gforge.inria.fr/svn/mpc/trunk@1003 211d60ee-9f03-0410-a15a-8952a2c7a4e4
| -rw-r--r-- | m4/mpc.m4 | 6 | ||||
| -rw-r--r-- | src/mpc.h | 4 | ||||
| -rw-r--r-- | src/set_x_x.c | 6 |
3 files changed, 10 insertions, 6 deletions
@@ -143,7 +143,7 @@ error #endif ]], [[]])],[AC_MSG_RESULT(DLL)],[ AC_MSG_RESULT(static) - AC_MSG_ERROR([gmp.h isn't a DLL: use --enable-static --disable-shared]) ]) + AC_MSG_ERROR([gmp is not available as a DLL: use --enable-static --disable-shared]) ]) AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ #include "mpfr.h" #if !__GMP_LIBGMP_DLL @@ -152,7 +152,7 @@ error #endif ]], [[]])],[AC_MSG_RESULT(DLL)],[ AC_MSG_RESULT(static) - AC_MSG_ERROR([gmp.h isn't a DLL: use --enable-static --disable-shared]) ]) + AC_MSG_ERROR([gmp is not available as a DLL: use --enable-static --disable-shared]) ]) else AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ #include "gmp.h" @@ -162,7 +162,7 @@ error #endif ]], [[]])],[AC_MSG_RESULT(static)],[ AC_MSG_RESULT(DLL) - AC_MSG_ERROR([gmp.h is a DLL: use --disable-static --enable-shared]) ]) + AC_MSG_ERROR([gmp is only available as a DLL: use --disable-static --enable-shared]) ]) fi ;; ]) @@ -41,6 +41,10 @@ MA 02111-1307, USA. */ #define MPC_VERSION \ MPC_VERSION_NUM(MPC_VERSION_MAJOR,MPC_VERSION_MINOR,MPC_VERSION_PATCHLEVEL) +/* Check if stdint.h/inttypes.h is included */ +#if defined (INTMAX_C) && defined (UINTMAX_C) +#define _MPC_H_HAVE_INTMAX_T 1 +#endif /* Return values */ diff --git a/src/set_x_x.c b/src/set_x_x.c index 86d45b7..37f8ab9 100644 --- a/src/set_x_x.c +++ b/src/set_x_x.c @@ -1,7 +1,7 @@ /* mpc_set_x_x -- Set complex number real and imaginary parts from parameters whose type is known by mpfr. -Copyright (C) INRIA, 2009 +Copyright (C) INRIA, 2009, 2011 This file is part of the MPC Library. @@ -22,10 +22,10 @@ MA 02111-1307, USA. */ #include "config.h" -#if HAVE_INTTYPES_H +#ifdef HAVE_INTTYPES_H # include <inttypes.h> /* for intmax_t */ #else -# if HAVE_STDINT_H +# ifdef HAVE_STDINT_H # include <stdint.h> # endif #endif |