mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
* internal.h: Move BDIGIT and related definitions from
include/ruby/defines.h. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@45027 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
dd998dd561
commit
841bf2b208
3 changed files with 59 additions and 54 deletions
|
@ -1,3 +1,8 @@
|
||||||
|
Mon Feb 17 20:00:27 2014 Tanaka Akira <akr@fsij.org>
|
||||||
|
|
||||||
|
* internal.h: Move BDIGIT and related definitions from
|
||||||
|
include/ruby/defines.h.
|
||||||
|
|
||||||
Mon Feb 17 17:41:55 2014 Nobuyoshi Nakada <nobu@ruby-lang.org>
|
Mon Feb 17 17:41:55 2014 Nobuyoshi Nakada <nobu@ruby-lang.org>
|
||||||
|
|
||||||
* marshal.c (marshal_dump, marshal_load): do not recycle wrapper
|
* marshal.c (marshal_dump, marshal_load): do not recycle wrapper
|
||||||
|
|
|
@ -143,60 +143,6 @@ void xfree(void*);
|
||||||
# define SIZEOF_LONG_LONG SIZEOF___INT64
|
# define SIZEOF_LONG_LONG SIZEOF___INT64
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifndef BDIGIT
|
|
||||||
# if SIZEOF_INT*2 <= SIZEOF_LONG_LONG
|
|
||||||
# define BDIGIT unsigned int
|
|
||||||
# define SIZEOF_BDIGITS SIZEOF_INT
|
|
||||||
# define BDIGIT_DBL unsigned LONG_LONG
|
|
||||||
# define BDIGIT_DBL_SIGNED LONG_LONG
|
|
||||||
# define PRI_BDIGIT_PREFIX ""
|
|
||||||
# define PRI_BDIGIT_DBL_PREFIX PRI_LL_PREFIX
|
|
||||||
# elif SIZEOF_INT*2 <= SIZEOF_LONG
|
|
||||||
# define BDIGIT unsigned int
|
|
||||||
# define SIZEOF_BDIGITS SIZEOF_INT
|
|
||||||
# define BDIGIT_DBL unsigned long
|
|
||||||
# define BDIGIT_DBL_SIGNED long
|
|
||||||
# define PRI_BDIGIT_PREFIX ""
|
|
||||||
# define PRI_BDIGIT_DBL_PREFIX "l"
|
|
||||||
# elif SIZEOF_SHORT*2 <= SIZEOF_LONG
|
|
||||||
# define BDIGIT unsigned short
|
|
||||||
# define SIZEOF_BDIGITS SIZEOF_SHORT
|
|
||||||
# define BDIGIT_DBL unsigned long
|
|
||||||
# define BDIGIT_DBL_SIGNED long
|
|
||||||
# define PRI_BDIGIT_PREFIX "h"
|
|
||||||
# define PRI_BDIGIT_DBL_PREFIX "l"
|
|
||||||
# else
|
|
||||||
# define BDIGIT unsigned short
|
|
||||||
# define SIZEOF_BDIGITS (SIZEOF_LONG/2)
|
|
||||||
# define SIZEOF_ACTUAL_BDIGIT SIZEOF_LONG
|
|
||||||
# define BDIGIT_DBL unsigned long
|
|
||||||
# define BDIGIT_DBL_SIGNED long
|
|
||||||
# define PRI_BDIGIT_PREFIX "h"
|
|
||||||
# define PRI_BDIGIT_DBL_PREFIX "l"
|
|
||||||
# endif
|
|
||||||
#endif
|
|
||||||
#ifndef SIZEOF_ACTUAL_BDIGIT
|
|
||||||
# define SIZEOF_ACTUAL_BDIGIT SIZEOF_BDIGITS
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifdef PRI_BDIGIT_PREFIX
|
|
||||||
# define PRIdBDIGIT PRI_BDIGIT_PREFIX"d"
|
|
||||||
# define PRIiBDIGIT PRI_BDIGIT_PREFIX"i"
|
|
||||||
# define PRIoBDIGIT PRI_BDIGIT_PREFIX"o"
|
|
||||||
# define PRIuBDIGIT PRI_BDIGIT_PREFIX"u"
|
|
||||||
# define PRIxBDIGIT PRI_BDIGIT_PREFIX"x"
|
|
||||||
# define PRIXBDIGIT PRI_BDIGIT_PREFIX"X"
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifdef PRI_BDIGIT_DBL_PREFIX
|
|
||||||
# define PRIdBDIGIT_DBL PRI_BDIGIT_DBL_PREFIX"d"
|
|
||||||
# define PRIiBDIGIT_DBL PRI_BDIGIT_DBL_PREFIX"i"
|
|
||||||
# define PRIoBDIGIT_DBL PRI_BDIGIT_DBL_PREFIX"o"
|
|
||||||
# define PRIuBDIGIT_DBL PRI_BDIGIT_DBL_PREFIX"u"
|
|
||||||
# define PRIxBDIGIT_DBL PRI_BDIGIT_DBL_PREFIX"x"
|
|
||||||
# define PRIXBDIGIT_DBL PRI_BDIGIT_DBL_PREFIX"X"
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifdef __CYGWIN__
|
#ifdef __CYGWIN__
|
||||||
#undef _WIN32
|
#undef _WIN32
|
||||||
#endif
|
#endif
|
||||||
|
|
54
internal.h
54
internal.h
|
@ -305,6 +305,60 @@ struct method_table_wrapper {
|
||||||
size_t serial;
|
size_t serial;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
#ifndef BDIGIT
|
||||||
|
# if SIZEOF_INT*2 <= SIZEOF_LONG_LONG
|
||||||
|
# define BDIGIT unsigned int
|
||||||
|
# define SIZEOF_BDIGITS SIZEOF_INT
|
||||||
|
# define BDIGIT_DBL unsigned LONG_LONG
|
||||||
|
# define BDIGIT_DBL_SIGNED LONG_LONG
|
||||||
|
# define PRI_BDIGIT_PREFIX ""
|
||||||
|
# define PRI_BDIGIT_DBL_PREFIX PRI_LL_PREFIX
|
||||||
|
# elif SIZEOF_INT*2 <= SIZEOF_LONG
|
||||||
|
# define BDIGIT unsigned int
|
||||||
|
# define SIZEOF_BDIGITS SIZEOF_INT
|
||||||
|
# define BDIGIT_DBL unsigned long
|
||||||
|
# define BDIGIT_DBL_SIGNED long
|
||||||
|
# define PRI_BDIGIT_PREFIX ""
|
||||||
|
# define PRI_BDIGIT_DBL_PREFIX "l"
|
||||||
|
# elif SIZEOF_SHORT*2 <= SIZEOF_LONG
|
||||||
|
# define BDIGIT unsigned short
|
||||||
|
# define SIZEOF_BDIGITS SIZEOF_SHORT
|
||||||
|
# define BDIGIT_DBL unsigned long
|
||||||
|
# define BDIGIT_DBL_SIGNED long
|
||||||
|
# define PRI_BDIGIT_PREFIX "h"
|
||||||
|
# define PRI_BDIGIT_DBL_PREFIX "l"
|
||||||
|
# else
|
||||||
|
# define BDIGIT unsigned short
|
||||||
|
# define SIZEOF_BDIGITS (SIZEOF_LONG/2)
|
||||||
|
# define SIZEOF_ACTUAL_BDIGIT SIZEOF_LONG
|
||||||
|
# define BDIGIT_DBL unsigned long
|
||||||
|
# define BDIGIT_DBL_SIGNED long
|
||||||
|
# define PRI_BDIGIT_PREFIX "h"
|
||||||
|
# define PRI_BDIGIT_DBL_PREFIX "l"
|
||||||
|
# endif
|
||||||
|
#endif
|
||||||
|
#ifndef SIZEOF_ACTUAL_BDIGIT
|
||||||
|
# define SIZEOF_ACTUAL_BDIGIT SIZEOF_BDIGITS
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#ifdef PRI_BDIGIT_PREFIX
|
||||||
|
# define PRIdBDIGIT PRI_BDIGIT_PREFIX"d"
|
||||||
|
# define PRIiBDIGIT PRI_BDIGIT_PREFIX"i"
|
||||||
|
# define PRIoBDIGIT PRI_BDIGIT_PREFIX"o"
|
||||||
|
# define PRIuBDIGIT PRI_BDIGIT_PREFIX"u"
|
||||||
|
# define PRIxBDIGIT PRI_BDIGIT_PREFIX"x"
|
||||||
|
# define PRIXBDIGIT PRI_BDIGIT_PREFIX"X"
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#ifdef PRI_BDIGIT_DBL_PREFIX
|
||||||
|
# define PRIdBDIGIT_DBL PRI_BDIGIT_DBL_PREFIX"d"
|
||||||
|
# define PRIiBDIGIT_DBL PRI_BDIGIT_DBL_PREFIX"i"
|
||||||
|
# define PRIoBDIGIT_DBL PRI_BDIGIT_DBL_PREFIX"o"
|
||||||
|
# define PRIuBDIGIT_DBL PRI_BDIGIT_DBL_PREFIX"u"
|
||||||
|
# define PRIxBDIGIT_DBL PRI_BDIGIT_DBL_PREFIX"x"
|
||||||
|
# define PRIXBDIGIT_DBL PRI_BDIGIT_DBL_PREFIX"X"
|
||||||
|
#endif
|
||||||
|
|
||||||
#define BIGNUM_EMBED_LEN_NUMBITS 3
|
#define BIGNUM_EMBED_LEN_NUMBITS 3
|
||||||
#ifndef BIGNUM_EMBED_LEN_MAX
|
#ifndef BIGNUM_EMBED_LEN_MAX
|
||||||
# if (SIZEOF_VALUE*3/SIZEOF_ACTUAL_BDIGIT) < (1 << BIGNUM_EMBED_LEN_NUMBITS)-1
|
# if (SIZEOF_VALUE*3/SIZEOF_ACTUAL_BDIGIT) < (1 << BIGNUM_EMBED_LEN_NUMBITS)-1
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue