From 8539fded7940514c86def60bdab1345c42405258 Mon Sep 17 00:00:00 2001 From: NIIMI Satoshi Date: Wed, 26 Sep 2007 11:37:34 +0000 Subject: [PATCH] 1.0.10.3: Grovel suseconds_t Instead to detect if suseconds_t exists by OS and architecture, check it in grovel-features.sh. --- contrib/sb-posix/constants.lisp | 4 ++-- tools-for-build/grovel-features.sh | 2 ++ tools-for-build/grovel-headers.c | 8 +++----- tools-for-build/os-provides-suseconds-t-test.c | 10 ++++++++++ version.lisp-expr | 2 +- 5 files changed, 18 insertions(+), 8 deletions(-) create mode 100644 tools-for-build/os-provides-suseconds-t-test.c diff --git a/contrib/sb-posix/constants.lisp b/contrib/sb-posix/constants.lisp index 440adb3..bf0fe3b 100644 --- a/contrib/sb-posix/constants.lisp +++ b/contrib/sb-posix/constants.lisp @@ -367,8 +367,8 @@ ;; utime(), utimes() #-win32 (:type suseconds-t ; OAOOM warning: similar kludge in tools-for-build - #-(and darwin ppc) "suseconds_t" - #+(and darwin ppc) "int") + #+os-provides-suseconds-t "suseconds_t" + #-os-provides-suseconds-t "long") #-win32 (:structure alien-utimbuf diff --git a/tools-for-build/grovel-features.sh b/tools-for-build/grovel-features.sh index db2cd54..8bc5a2c 100644 --- a/tools-for-build/grovel-features.sh +++ b/tools-for-build/grovel-features.sh @@ -26,3 +26,5 @@ featurep os-provides-dladdr featurep os-provides-putwc featurep os-provides-blksize-t + +featurep os-provides-suseconds-t diff --git a/tools-for-build/grovel-headers.c b/tools-for-build/grovel-headers.c index c5de8e8..49eeac5 100644 --- a/tools-for-build/grovel-headers.c +++ b/tools-for-build/grovel-headers.c @@ -241,11 +241,9 @@ main(int argc, char *argv[]) DEFTYPE("off-t", off_t); DEFTYPE("size-t", size_t); DEFTYPE("time-t", time_t); -#if defined(LISP_FEATURE_DARWIN) && defined(LISP_FEATURE_PPC) - /* No idea if this is an issue with PPC versions of OS X, or just - * 10.3, but at any rate on some Darwin versions suseconds_t seems - * to be missing... Similar kludge in sb-posix. */ - DEFTYPE("suseconds-t", int); +#if !defined(LISP_FEATURE_OS_PROVIDES_SUSECONDS_T) + /* Similar kludge in sb-posix. */ + DEFTYPE("suseconds-t", long); #else DEFTYPE("suseconds-t", suseconds_t); #endif diff --git a/tools-for-build/os-provides-suseconds-t-test.c b/tools-for-build/os-provides-suseconds-t-test.c new file mode 100644 index 0000000..5fcd725 --- /dev/null +++ b/tools-for-build/os-provides-suseconds-t-test.c @@ -0,0 +1,10 @@ +/* test to build and run so that we know if we have blksize_t */ + +#include + +int main () +{ + suseconds_t s = 0; + s = s + s; + return 104; +} diff --git a/version.lisp-expr b/version.lisp-expr index c54337c..8c40497 100644 --- a/version.lisp-expr +++ b/version.lisp-expr @@ -17,4 +17,4 @@ ;;; checkins which aren't released. (And occasionally for internal ;;; versions, especially for internal versions off the main CVS ;;; branch, it gets hairier, e.g. "0.pre7.14.flaky4.13".) -"1.0.10.2" +"1.0.10.3" -- 1.7.10.4