* tag.h (scm_tag): deprecation expired - removed.

[bpt/guile.git] / libguile / numbers.h

diff --git a/libguile/numbers.h b/libguile/numbers.h
index d5b2809..23df0d7 100644 (file)
--- a/libguile/numbers.h
+++ b/libguile/numbers.h
@@ -2,7 +2,7 @@
 
 #ifndef NUMBERSH
 #define NUMBERSH
-/*     Copyright (C) 1995, 1996, 1998, 2000 Free Software Foundation, Inc.
+/* Copyright (C) 1995,1996,1998,2000,2001 Free Software Foundation, Inc.
  * 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -290,43 +290,19 @@ extern SCM scm_dbl2big (double d);
 extern double scm_big2dbl (SCM b);
 extern SCM scm_long2num (long sl);
 extern SCM scm_ulong2num (unsigned long sl);
-extern long scm_num2long (SCM num, char *pos, const char *s_caller);
+extern long scm_num2long (SCM num, unsigned long int pos,
+                         const char *s_caller);
 #ifdef HAVE_LONG_LONGS
 extern SCM scm_long_long2num (long_long sl);
-extern long_long scm_num2long_long (SCM num, char *pos,
+extern long_long scm_num2long_long (SCM num, unsigned long int pos,
                                     const char *s_caller);
+extern ulong_long scm_num2ulong_long (SCM num, unsigned long int pos,
+                                     const char *s_caller);
 #endif
-extern unsigned long scm_num2ulong (SCM num, char *pos,
+extern unsigned long scm_num2ulong (SCM num, unsigned long int pos,
                                     const char *s_caller);
 extern void scm_init_numbers (void);
 
-\f
-
-#if (SCM_DEBUG_DEPRECATED == 0)
-
-typedef struct scm_dblproc
-{
-  char *scm_string;
-  double (*cproc) ();
-} scm_dblproc;
-
-#define SCM_UNEGFIXABLE(n) ((n) <= -SCM_MOST_NEGATIVE_FIXNUM)
-#define SCM_FLOBUFLEN (10+2*(sizeof(double)/sizeof(char)*SCM_CHAR_BIT*3+9)/10)
-#define SCM_INEXP(x) SCM_INEXACTP(x)
-#define SCM_CPLXP(x) SCM_COMPLEXP(x)
-#define SCM_REAL(x) (SCM_SLOPPY_REALP (x) ? SCM_REAL_VALUE (x) : SCM_COMPLEX_REAL (x))
-#define SCM_IMAG(x) (SCM_SLOPPY_REALP (x) ? 0.0 : SCM_COMPLEX_IMAG (x))
-#define SCM_REALPART(x) (SCM_SLOPPY_REALP (x) ? SCM_REAL_VALUE (x) : SCM_COMPLEX_REAL (x))
-#define scm_makdbl scm_make_complex
-#define SCM_SINGP(x) 0
-#define SCM_NUM2DBL(x) scm_num2dbl(x, "SCM_NUM2DBL")
-
-#ifndef SCM_BIGDIG
-# define SCM_NO_BIGDIG
-#endif
-
-#endif  /* SCM_DEBUG_DEPRECATED == 0 */
-
 #endif  /* NUMBERSH */
 
 /*