diff options
| author | thevenyp <thevenyp@280ebfd0-de03-0410-8827-d642c229c3f4> | 2009-01-19 16:21:14 +0000 |
|---|---|---|
| committer | thevenyp <thevenyp@280ebfd0-de03-0410-8827-d642c229c3f4> | 2009-01-19 16:21:14 +0000 |
| commit | 06c4c707740400a1af7bf4ffbfdb141a91e10b9a (patch) | |
| tree | b9b3a1a4d760314b1e0fee9933ce7dc873419435 | |
| parent | f9ff9170011c56af166d430e2047cf5d2e4688b8 (diff) | |
| download | mpfr-06c4c707740400a1af7bf4ffbfdb141a91e10b9a.tar.gz | |
get_uj.c get_sj.c tests/tset_sj.c tests/tfits.c fits_intmax.c fits_uintmax.c set_uj.c set_sj.c: Use the same #include order for intmax_t as in gmp.
[partial merge of r5825]
git-svn-id: svn://scm.gforge.inria.fr/svn/mpfr/branches/2.4@5847 280ebfd0-de03-0410-8827-d642c229c3f4
| -rw-r--r-- | fits_intmax.c | 11 | ||||
| -rw-r--r-- | fits_uintmax.c | 11 | ||||
| -rw-r--r-- | get_sj.c | 11 | ||||
| -rw-r--r-- | get_uj.c | 11 | ||||
| -rw-r--r-- | set_sj.c | 11 | ||||
| -rw-r--r-- | set_uj.c | 11 | ||||
| -rw-r--r-- | tests/tfits.c | 11 | ||||
| -rw-r--r-- | tests/tset_sj.c | 11 |
8 files changed, 48 insertions, 40 deletions
diff --git a/fits_intmax.c b/fits_intmax.c index c9af45cda..0a9154a61 100644 --- a/fits_intmax.c +++ b/fits_intmax.c @@ -31,11 +31,12 @@ MA 02110-1301, USA. */ # define __STDC_CONSTANT_MACROS #endif -#ifdef HAVE_STDINT_H -# include <stdint.h> -#endif -#ifdef HAVE_INTTYPES_H -# include <inttypes.h> +#if HAVE_INTTYPES_H +# include <inttypes.h> /* for intmax_t */ +#else +# if HAVE_STDINT_H +# include <stdint.h> +# endif #endif #include "mpfr-impl.h" diff --git a/fits_uintmax.c b/fits_uintmax.c index 9f37416e1..0f77a04e1 100644 --- a/fits_uintmax.c +++ b/fits_uintmax.c @@ -31,11 +31,12 @@ MA 02110-1301, USA. */ # define __STDC_CONSTANT_MACROS #endif -#ifdef HAVE_STDINT_H -# include <stdint.h> -#endif -#ifdef HAVE_INTTYPES_H -# include <inttypes.h> +#if HAVE_INTTYPES_H +# include <inttypes.h> /* for intmax_t */ +#else +# if HAVE_STDINT_H +# include <stdint.h> +# endif #endif #include "mpfr-impl.h" @@ -31,11 +31,12 @@ MA 02110-1301, USA. */ # define __STDC_CONSTANT_MACROS #endif -#ifdef HAVE_STDINT_H -# include <stdint.h> -#endif -#ifdef HAVE_INTTYPES_H -# include <inttypes.h> +#if HAVE_INTTYPES_H +# include <inttypes.h> /* for intmax_t */ +#else +# if HAVE_STDINT_H +# include <stdint.h> +# endif #endif #include "mpfr-impl.h" @@ -31,11 +31,12 @@ MA 02110-1301, USA. */ # define __STDC_CONSTANT_MACROS #endif -#ifdef HAVE_STDINT_H -# include <stdint.h> -#endif -#ifdef HAVE_INTTYPES_H -# include <inttypes.h> +#if HAVE_INTTYPES_H +# include <inttypes.h> /* for intmax_t */ +#else +# if HAVE_STDINT_H +# include <stdint.h> +# endif #endif #include "mpfr-impl.h" @@ -31,11 +31,12 @@ MA 02110-1301, USA. */ # define __STDC_CONSTANT_MACROS #endif -#ifdef HAVE_STDINT_H -# include <stdint.h> -#endif -#ifdef HAVE_INTTYPES_H -# include <inttypes.h> +#if HAVE_INTTYPES_H +# include <inttypes.h> /* for intmax_t */ +#else +# if HAVE_STDINT_H +# include <stdint.h> +# endif #endif #include "mpfr-impl.h" @@ -31,11 +31,12 @@ MA 02110-1301, USA. */ # define __STDC_CONSTANT_MACROS #endif -#ifdef HAVE_STDINT_H -# include <stdint.h> -#endif -#ifdef HAVE_INTTYPES_H -# include <inttypes.h> +#if HAVE_INTTYPES_H +# include <inttypes.h> /* for intmax_t */ +#else +# if HAVE_STDINT_H +# include <stdint.h> +# endif #endif #define MPFR_NEED_LONGLONG_H diff --git a/tests/tfits.c b/tests/tfits.c index 110ae1b54..a7cd02508 100644 --- a/tests/tfits.c +++ b/tests/tfits.c @@ -37,11 +37,12 @@ MA 02110-1301, USA. */ # define __STDC_CONSTANT_MACROS #endif -#ifdef HAVE_STDINT_H -# include <stdint.h> -#endif -#ifdef HAVE_INTTYPES_H -# include <inttypes.h> +#if HAVE_INTTYPES_H +# include <inttypes.h> /* for intmax_t */ +#else +# if HAVE_STDINT_H +# include <stdint.h> +# endif #endif #include "mpfr-test.h" diff --git a/tests/tset_sj.c b/tests/tset_sj.c index 0763e79b7..935b9a727 100644 --- a/tests/tset_sj.c +++ b/tests/tset_sj.c @@ -36,11 +36,12 @@ MA 02110-1301, USA. */ # define __STDC_CONSTANT_MACROS #endif -#ifdef HAVE_STDINT_H -# include <stdint.h> -#endif -#ifdef HAVE_INTTYPES_H -# include <inttypes.h> +#if HAVE_INTTYPES_H +# include <inttypes.h> /* for intmax_t */ +#else +# if HAVE_STDINT_H +# include <stdint.h> +# endif #endif #include "mpfr-test.h" |