summaryrefslogtreecommitdiff
path: root/libguile/numbers.h
diff options
context:
space:
mode:
authorAndy Wingo <wingo@pobox.com>2018-06-21 08:39:03 +0200
committerAndy Wingo <wingo@pobox.com>2018-06-21 20:18:54 +0200
commit16879cabed0e9bf218986bc886c3336a5f5a21c0 (patch)
tree3864d5f4926d4141b2ca0a0d378ca7b854aa6cc8 /libguile/numbers.h
parent5e5afde06fd9dd0992294d6c7dc9f9966c0caa37 (diff)
downloadguile-16879cabed0e9bf218986bc886c3336a5f5a21c0.tar.gz
Replace uses of scm_t_int8, scm_t_uintmax, etc with stdint types
* libguile/bitvectors.c: * libguile/bitvectors.h: * libguile/bytevectors.c: * libguile/bytevectors.h: * libguile/chars.c: * libguile/continuations.c: * libguile/control.c: * libguile/conv-integer.i.c: * libguile/conv-uinteger.i.c: * libguile/dynstack.c: * libguile/dynstack.h: * libguile/foreign.c: * libguile/frames.c: * libguile/frames.h: * libguile/gc-inline.h: * libguile/gc.h: * libguile/gsubr.c: * libguile/gsubr.h: * libguile/hash.c: * libguile/i18n.c: * libguile/instructions.c: * libguile/intrinsics.c: * libguile/intrinsics.h: * libguile/loader.c: * libguile/loader.h: * libguile/numbers.c: * libguile/numbers.h: * libguile/pairs.c: * libguile/ports-internal.h: * libguile/ports.c: * libguile/ports.h: * libguile/posix.c: * libguile/print.c: * libguile/print.h: * libguile/programs.c: * libguile/programs.h: * libguile/r6rs-ports.c: * libguile/random.c: * libguile/random.h: * libguile/scm.h: * libguile/socket.c: * libguile/srfi-4.c: * libguile/srfi-4.h: * libguile/stacks.c: * libguile/stime.c: * libguile/strings.c: * libguile/struct.c: * libguile/struct.h: * libguile/symbols.c: * libguile/threads.c: * libguile/threads.h: * libguile/uniform.c: * libguile/vm-engine.c: * libguile/vm.c: * libguile/vm.h: * libguile/vports.c: * test-suite/standalone/test-conversion.c: * test-suite/standalone/test-ffi-lib.c: * test-suite/standalone/test-scm-take-u8vector.c: * test-suite/standalone/test-srfi-4.c: Replace e.g. scm_t_uint8 with uint8_t.
Diffstat (limited to 'libguile/numbers.h')
-rw-r--r--libguile/numbers.h62
1 files changed, 31 insertions, 31 deletions
diff --git a/libguile/numbers.h b/libguile/numbers.h
index 5db2eae59..121573a23 100644
--- a/libguile/numbers.h
+++ b/libguile/numbers.h
@@ -118,11 +118,11 @@ typedef long scm_t_inum;
/* SCM_INTBUFLEN is the maximum number of characters neccessary for
- * the printed or scm_string representation of an scm_t_intmax in
+ * the printed or scm_string representation of an intmax_t in
* radix 2. The buffer passed to scm_iint2str and scm_iuint2str must
* be of this size, for example.
*/
-#define SCM_INTBUFLEN (5 + SCM_CHAR_BIT*sizeof(scm_t_intmax))
+#define SCM_INTBUFLEN (5 + SCM_CHAR_BIT*sizeof(intmax_t))
@@ -245,8 +245,8 @@ SCM_INTERNAL SCM scm_i_logand (SCM x, SCM y, SCM rest);
SCM_INTERNAL SCM scm_i_logior (SCM x, SCM y, SCM rest);
SCM_INTERNAL SCM scm_i_logxor (SCM x, SCM y, SCM rest);
-SCM_API size_t scm_iint2str (scm_t_intmax num, int rad, char *p);
-SCM_API size_t scm_iuint2str (scm_t_uintmax num, int rad, char *p);
+SCM_API size_t scm_iint2str (intmax_t num, int rad, char *p);
+SCM_API size_t scm_iuint2str (uintmax_t num, int rad, char *p);
SCM_API SCM scm_number_to_string (SCM x, SCM radix);
SCM_API int scm_print_real (SCM sexp, SCM port, scm_print_state *pstate);
SCM_API int scm_print_complex (SCM sexp, SCM port, scm_print_state *pstate);
@@ -355,46 +355,46 @@ SCM_INTERNAL void scm_i_print_complex (double real, double imag, SCM port);
SCM_API int scm_is_integer (SCM val);
SCM_API int scm_is_exact_integer (SCM val);
SCM_API int scm_is_signed_integer (SCM val,
- scm_t_intmax min, scm_t_intmax max);
+ intmax_t min, intmax_t max);
SCM_API int scm_is_unsigned_integer (SCM val,
- scm_t_uintmax min, scm_t_uintmax max);
+ uintmax_t min, uintmax_t max);
-SCM_API SCM scm_from_signed_integer (scm_t_intmax val);
-SCM_API SCM scm_from_unsigned_integer (scm_t_uintmax val);
+SCM_API SCM scm_from_signed_integer (intmax_t val);
+SCM_API SCM scm_from_unsigned_integer (uintmax_t val);
-SCM_API scm_t_intmax scm_to_signed_integer (SCM val,
- scm_t_intmax min,
- scm_t_intmax max);
-SCM_API scm_t_uintmax scm_to_unsigned_integer (SCM val,
- scm_t_uintmax min,
- scm_t_uintmax max);
+SCM_API intmax_t scm_to_signed_integer (SCM val,
+ intmax_t min,
+ intmax_t max);
+SCM_API uintmax_t scm_to_unsigned_integer (SCM val,
+ uintmax_t min,
+ uintmax_t max);
-SCM_API scm_t_int8 scm_to_int8 (SCM x);
-SCM_API SCM scm_from_int8 (scm_t_int8 x);
+SCM_API int8_t scm_to_int8 (SCM x);
+SCM_API SCM scm_from_int8 (int8_t x);
-SCM_API scm_t_uint8 scm_to_uint8 (SCM x);
-SCM_API SCM scm_from_uint8 (scm_t_uint8 x);
+SCM_API uint8_t scm_to_uint8 (SCM x);
+SCM_API SCM scm_from_uint8 (uint8_t x);
-SCM_API scm_t_int16 scm_to_int16 (SCM x);
-SCM_API SCM scm_from_int16 (scm_t_int16 x);
+SCM_API int16_t scm_to_int16 (SCM x);
+SCM_API SCM scm_from_int16 (int16_t x);
-SCM_API scm_t_uint16 scm_to_uint16 (SCM x);
-SCM_API SCM scm_from_uint16 (scm_t_uint16 x);
+SCM_API uint16_t scm_to_uint16 (SCM x);
+SCM_API SCM scm_from_uint16 (uint16_t x);
-SCM_API scm_t_int32 scm_to_int32 (SCM x);
-SCM_API SCM scm_from_int32 (scm_t_int32 x);
+SCM_API int32_t scm_to_int32 (SCM x);
+SCM_API SCM scm_from_int32 (int32_t x);
-SCM_API scm_t_uint32 scm_to_uint32 (SCM x);
-SCM_API SCM scm_from_uint32 (scm_t_uint32 x);
+SCM_API uint32_t scm_to_uint32 (SCM x);
+SCM_API SCM scm_from_uint32 (uint32_t x);
SCM_API scm_t_wchar scm_to_wchar (SCM x);
SCM_API SCM scm_from_wchar (scm_t_wchar x);
-SCM_API scm_t_int64 scm_to_int64 (SCM x);
-SCM_API SCM scm_from_int64 (scm_t_int64 x);
+SCM_API int64_t scm_to_int64 (SCM x);
+SCM_API SCM scm_from_int64 (int64_t x);
-SCM_API scm_t_uint64 scm_to_uint64 (SCM x);
-SCM_API SCM scm_from_uint64 (scm_t_uint64 x);
+SCM_API uint64_t scm_to_uint64 (SCM x);
+SCM_API SCM scm_from_uint64 (uint64_t x);
SCM_API void scm_to_mpz (SCM x, mpz_t rop);
SCM_API SCM scm_from_mpz (mpz_t rop);
@@ -494,7 +494,7 @@ SCM_API SCM scm_from_mpz (mpz_t rop);
#define scm_to_uintmax scm_to_uint64
#define scm_from_uintmax scm_from_uint64
#else
-#error sizeof(scm_t_intmax) is not 4 or 8.
+#error sizeof(intmax_t) is not 4 or 8.
#endif
#endif