From bf49096fffef5742893bcdb5610b03055ff689dd Mon Sep 17 00:00:00 2001 From: Neil Jerram Date: Tue, 2 Mar 2010 23:23:52 +0000 Subject: [PATCH] Use scm_t_ptrdiff consistently instead of ptrdiff_t This fixes the following errors in a MinGW cross-build. libtool: compile: i586-mingw32msvc-gcc -DHAVE_CONFIG_H -I.. -I.. -I.. -I/usr/local/i586-mingw32msvc/include -I/usr/local/i586-mingw32msvc/include -g -O2 -Wall -Wmissing-prototypes -Werror -MT libguile_la-discouraged.lo -MD -MP -MF .deps/libguile_la-discouraged.Tpo -c discouraged.c -DDLL_EXPORT -DPIC -o .libs/libguile_la-discouraged.o discouraged.c:75: error: conflicting types for 'scm_ptrdiff2num' ../libguile/discouraged.h:75: error: previous declaration of 'scm_ptrdiff2num' was here discouraged.c:123: error: conflicting types for 'scm_num2ptrdiff' ../libguile/discouraged.h:89: error: previous declaration of 'scm_num2ptrdiff' was here * libguile/discouraged.c (scm_ptrdiff2num, scm_num2ptrdiff): Use scm_t_ptrdiff instead of ptrdiff_t. --- libguile/discouraged.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libguile/discouraged.c b/libguile/discouraged.c index 9efd92a00..47b1317b5 100644 --- a/libguile/discouraged.c +++ b/libguile/discouraged.c @@ -71,7 +71,7 @@ scm_size2num (size_t x) } SCM -scm_ptrdiff2num (ptrdiff_t x) +scm_ptrdiff2num (scm_t_ptrdiff x) { return scm_from_ssize_t (x); } @@ -118,7 +118,7 @@ scm_num2size (SCM x, unsigned long pos, const char *s_caller) return scm_to_size_t (x); } -ptrdiff_t +scm_t_ptrdiff scm_num2ptrdiff (SCM x, unsigned long pos, const char *s_caller) { return scm_to_ssize_t (x);