From 74f543f7ae858c414d24d541bc42ede585db105a Mon Sep 17 00:00:00 2001 From: Eli Barzilay Date: Fri, 29 Feb 2008 15:39:18 +0000 Subject: [PATCH] v4-ified svn: r8829 --- collects/ffi/c-printf.ss | 4 +--- collects/ffi/crypt.ss | 4 +--- collects/ffi/esd.ss | 4 +--- collects/ffi/examples/c-printf.ss | 9 ++++----- collects/ffi/examples/crypt.ss | 9 ++++----- collects/ffi/examples/esd.ss | 9 ++++----- collects/ffi/examples/magick.ss | 9 ++++----- collects/ffi/examples/sndfile.ss | 9 ++++----- collects/ffi/examples/tcl.ss | 9 ++++----- collects/ffi/examples/xmmsctrl.ss | 9 ++++----- collects/ffi/examples/xosd.ss | 9 ++++----- collects/ffi/magick.ss | 8 +++----- collects/ffi/sndfile.ss | 6 ++---- collects/ffi/tcl.ss | 4 +--- collects/ffi/xmmsctrl.ss | 4 +--- collects/ffi/xosd.ss | 4 +--- 16 files changed, 43 insertions(+), 67 deletions(-) diff --git a/collects/ffi/c-printf.ss b/collects/ffi/c-printf.ss index f1f328a1d5..754b06ca66 100644 --- a/collects/ffi/c-printf.ss +++ b/collects/ffi/c-printf.ss @@ -1,4 +1,4 @@ -(module c-printf mzscheme +#lang scheme/base (require mzlib/foreign) (unsafe!) @@ -37,5 +37,3 @@ (apply printf fmt args))) (define-unsafer c-printf-is-dangerous!) - -) diff --git a/collects/ffi/crypt.ss b/collects/ffi/crypt.ss index d39c97bc39..4eccfe24dc 100644 --- a/collects/ffi/crypt.ss +++ b/collects/ffi/crypt.ss @@ -1,4 +1,4 @@ -(module crypt mzscheme +#lang scheme/base (require mzlib/foreign) (unsafe!) @@ -61,5 +61,3 @@ r (loop (- n 8) (cons (string->number (substring bin n (+ n 8)) 2) r))))))) - -) diff --git a/collects/ffi/esd.ss b/collects/ffi/esd.ss index ba9a6d3632..e122181930 100644 --- a/collects/ffi/esd.ss +++ b/collects/ffi/esd.ss @@ -1,4 +1,4 @@ -(module esd mzscheme +#lang scheme/base (require mzlib/foreign) (unsafe!) @@ -76,5 +76,3 @@ (defesd* esd-sample-kill : [_esd] _sample -> _int) (provide default-esd) (define default-esd (make-parameter (esd-open-sound) esd?)) - -) diff --git a/collects/ffi/examples/c-printf.ss b/collects/ffi/examples/c-printf.ss index 019fbf0346..723f065917 100755 --- a/collects/ffi/examples/c-printf.ss +++ b/collects/ffi/examples/c-printf.ss @@ -1,9 +1,8 @@ -#!/bin/sh -#| -exec mzscheme -r "$0" "$@" -|# +#! /usr/bin/env mzscheme -(require (lib "c-printf.ss" "ffi")) +#lang scheme/base + +(require ffi/c-printf) (c-printf-is-dangerous!) ; see last example below diff --git a/collects/ffi/examples/crypt.ss b/collects/ffi/examples/crypt.ss index a134b887c7..2b479ad823 100755 --- a/collects/ffi/examples/crypt.ss +++ b/collects/ffi/examples/crypt.ss @@ -1,9 +1,8 @@ -#!/bin/sh -#| -exec mzscheme -r "$0" "$@" -|# +#! /usr/bin/env mzscheme -(require (lib "crypt.ss" "ffi")) +#lang scheme/base + +(require ffi/crypt) (define passwd "foo") (define salt "xz") diff --git a/collects/ffi/examples/esd.ss b/collects/ffi/examples/esd.ss index 65777524b5..0952ee9acc 100755 --- a/collects/ffi/examples/esd.ss +++ b/collects/ffi/examples/esd.ss @@ -1,9 +1,8 @@ -#!/bin/sh -#| -exec mzscheme -r "$0" "$@" -|# +#! /usr/bin/env mzscheme -(require (lib "esd.ss" "ffi")) +#lang scheme/base + +(require ffi/esd) (printf "default = ~s\n" (default-esd)) (printf "latency = ~s\n" (esd-get-latency)) diff --git a/collects/ffi/examples/magick.ss b/collects/ffi/examples/magick.ss index 1deb975082..1beec94205 100755 --- a/collects/ffi/examples/magick.ss +++ b/collects/ffi/examples/magick.ss @@ -1,9 +1,8 @@ -#!/bin/sh -#| -exec mzscheme -rg "$0" "$@" -|# +#! /usr/bin/env mzscheme -(require (lib "magick.ss" "ffi")) +#lang scheme/base + +(require ffi/magick (for-syntax scheme/base)) (define-syntax (test stx) (syntax-case stx () diff --git a/collects/ffi/examples/sndfile.ss b/collects/ffi/examples/sndfile.ss index 98460546d5..d6d8262008 100755 --- a/collects/ffi/examples/sndfile.ss +++ b/collects/ffi/examples/sndfile.ss @@ -1,9 +1,8 @@ -#!/bin/sh -#| -exec mzscheme -r "$0" "$@" -|# +#! /usr/bin/env mzscheme -(require (lib "sndfile.ss" "ffi")) +#lang scheme/base + +(require ffi/sndfile) ;; (require (lib "swindle.ss" "swindle")) diff --git a/collects/ffi/examples/tcl.ss b/collects/ffi/examples/tcl.ss index 9861b61b0f..8550fadb76 100755 --- a/collects/ffi/examples/tcl.ss +++ b/collects/ffi/examples/tcl.ss @@ -1,9 +1,8 @@ -#!/bin/sh -#| -exec mzscheme -r "$0" "$@" -|# +#! /usr/bin/env mzscheme -(require (lib "tcl.ss" "ffi")) +#lang scheme/base + +(require ffi/tcl) (define (tcldemo . strs) (for-each (lambda (s) diff --git a/collects/ffi/examples/xmmsctrl.ss b/collects/ffi/examples/xmmsctrl.ss index 260958b2d6..8645381b19 100755 --- a/collects/ffi/examples/xmmsctrl.ss +++ b/collects/ffi/examples/xmmsctrl.ss @@ -1,9 +1,8 @@ -#!/bin/sh -#| -exec mzscheme -r "$0" "$@" -|# +#! /usr/bin/env mzscheme -(require (prefix xmms- (lib "xmmsctrl.ss" "ffi"))) +#lang scheme/base + +(require (prefix-in xmms- ffi/xmmsctrl)) (printf "version: ~s\n" (xmms-get-version)) (printf "skin: ~s\n" (xmms-get-skin)) diff --git a/collects/ffi/examples/xosd.ss b/collects/ffi/examples/xosd.ss index 961904056f..a0eeba45ec 100755 --- a/collects/ffi/examples/xosd.ss +++ b/collects/ffi/examples/xosd.ss @@ -1,9 +1,8 @@ -#!/bin/sh -#| -exec mzscheme -r "$0" "$@" -|# +#! /usr/bin/env mzscheme -(require (lib "xosd.ss" "ffi")) +#lang scheme/base + +(require ffi/xosd) (define x (xosd-create)) diff --git a/collects/ffi/magick.ss b/collects/ffi/magick.ss index 5eac04f942..4a4f38e2e8 100644 --- a/collects/ffi/magick.ss +++ b/collects/ffi/magick.ss @@ -1,4 +1,4 @@ -(module magick mzscheme +#lang scheme/base (require mzlib/foreign) (unsafe!) @@ -29,7 +29,7 @@ [else x])))) ; can use NULL as a pixel wand (see floodfill) ;; Use a struct for this because we want to keep the associated image width -(define-struct PixelIterator (ptr width)) +(define-struct PixelIterator (ptr [width #:mutable])) (define _PixelIterator (make-ctype _pointer PixelIterator-ptr (lambda (ptr) @@ -1380,7 +1380,7 @@ (w : _MagickWand = (if (null? args) (NewMagickWand) arg)) (_file = (if (null? args) arg (car args))) -> _status - -> (if (null? args) w)) + -> (if (null? args) w (void))) ;; MagickReadImageBlob reads an image or image sequence from a blob. (defmagick* MagickReadImageBlob : @@ -2799,5 +2799,3 @@ (defmagick DestroyDrawInfo : _DrawInfo -> _void) - -) diff --git a/collects/ffi/sndfile.ss b/collects/ffi/sndfile.ss index 2e9cde8506..0ee3270821 100644 --- a/collects/ffi/sndfile.ss +++ b/collects/ffi/sndfile.ss @@ -1,4 +1,4 @@ -(module sndfile mzscheme +#lang scheme/base (require mzlib/foreign) (unsafe!) @@ -14,7 +14,7 @@ ;; translating from c->scheme, ie. creating the object in scheme it will be ;; wraped by an object finilazer that uses the libsndfile fuction sf_close that ;; return a 0 upon sucsessfull termination or an error. -(define-struct sndfile (ptr info)) +(define-struct sndfile (ptr [info #:mutable])) (define _sndfile (make-ctype _pointer sndfile-ptr (lambda (p) @@ -341,5 +341,3 @@ (provide write-sound*) (define (write-sound* file data meta) (write-sound-internal file data meta)) - -) diff --git a/collects/ffi/tcl.ss b/collects/ffi/tcl.ss index cd405f9c89..08979b4fbd 100644 --- a/collects/ffi/tcl.ss +++ b/collects/ffi/tcl.ss @@ -1,4 +1,4 @@ -(module tcl mzscheme +#lang scheme/base (require mzlib/foreign) (unsafe!) @@ -47,5 +47,3 @@ (define eval-tcl (get-ffi-obj "Tcl_Eval" libtcl (_fun _interp* (expr : _string) -> _tclret))) - -) diff --git a/collects/ffi/xmmsctrl.ss b/collects/ffi/xmmsctrl.ss index f4ef4807b1..ecccddcbe1 100644 --- a/collects/ffi/xmmsctrl.ss +++ b/collects/ffi/xmmsctrl.ss @@ -1,4 +1,4 @@ -(module xmmsctrl mzscheme +#lang scheme/base (require mzlib/foreign) (unsafe!) @@ -107,5 +107,3 @@ (defxmms quit : _session -> _void) (defxmms play-pause : _session -> _void) (defxmms playlist-ins-url-string : _session _string _pos -> _void) - -) diff --git a/collects/ffi/xosd.ss b/collects/ffi/xosd.ss index 77b63ff188..8a074f20dc 100644 --- a/collects/ffi/xosd.ss +++ b/collects/ffi/xosd.ss @@ -1,4 +1,4 @@ -(module xosd mzscheme +#lang scheme/base (require mzlib/foreign) (unsafe!) @@ -102,5 +102,3 @@ (defxosd* xosd-set-bar-length : _xosd _int -> _status) (defxosd* xosd-scroll : _xosd _int -> _status) - -)