Use HAVE_LONG_LONG instead of HAVE_LONG_LONGS and test

[bpt/guile.git] / srfi / srfi-14.scm

diff --git a/srfi/srfi-14.scm b/srfi/srfi-14.scm
index 1cea4e0..c47ddd5 100644 (file)
--- a/srfi/srfi-14.scm
+++ b/srfi/srfi-14.scm
@@ -16,10 +16,33 @@
 ;;;; along with this software; see the file COPYING.  If not, write to
 ;;;; the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
 ;;;; Boston, MA 02111-1307 USA
+;;;;
+;;;; As a special exception, the Free Software Foundation gives permission
+;;;; for additional uses of the text contained in its release of GUILE.
+;;;;
+;;;; The exception is that, if you link the GUILE library with other files
+;;;; to produce an executable, this does not by itself cause the
+;;;; resulting executable to be covered by the GNU General Public License.
+;;;; Your use of that executable is in no way restricted on account of
+;;;; linking the GUILE library code into it.
+;;;;
+;;;; This exception does not however invalidate any other reasons why
+;;;; the executable file might be covered by the GNU General Public License.
+;;;;
+;;;; This exception applies only to the code released by the
+;;;; Free Software Foundation under the name GUILE.  If you copy
+;;;; code from other Free Software Foundation releases into a copy of
+;;;; GUILE, as the General Public License permits, the exception does
+;;;; not apply to the code that you add in this way.  To avoid misleading
+;;;; anyone as to the status of such modified files, you must delete
+;;;; this exception notice from them.
+;;;;
+;;;; If you write modifications of your own for GUILE, it is your choice
+;;;; whether to permit this exception to apply to your modifications.
+;;;; If you do not wish that, delete this exception notice.
 
-(define-module (srfi srfi-14))
-
-(export 
+(define-module (srfi srfi-14)
+  :export (
 ;;; General procedures
  char-set?
  char-set=
@@ -40,7 +63,7 @@
  char-set-copy
  char-set
  list->char-set list->char-set!
- string->char-set string-char-set!
+ string->char-set string->char-set!
  char-set-filter char-set-filter!
  ucs-range->char-set ucs-range->char-set!
  ->char-set
@@ -88,11 +111,11 @@
  char-set:ascii
  char-set:empty
  char-set:full
- )
+ ))
 
 (cond-expand-provide (current-module) '(srfi-14))
 
-(dynamic-call "scm_init_srfi_14" (dynamic-link "libguile-srfi-srfi-13-14"))
+(load-extension "libguile-srfi-srfi-13-14" "scm_init_srfi_14")
 
 (define (->char-set x)
   (cond