* validate.h

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

diff --git a/libguile/options.h b/libguile/options.h
index 8499f62..7450b73 100644 (file)
--- a/libguile/options.h
+++ b/libguile/options.h
@@ -2,7 +2,7 @@
 
 #ifndef OPTIONSH
 #define OPTIONSH
-/*     Copyright (C) 1995,1996 Mikael Djurfeldt
+/*     Copyright (C) 1995,1996, 2000 Free Software Foundation
  * 
  * 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
@@ -16,7 +16,8 @@
  * 
  * You should have received a copy of the GNU General Public License
  * along with this software; see the file COPYING.  If not, write to
- * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ * 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.
@@ -43,33 +44,43 @@
  * If you do not wish that, delete this exception notice.
  *
  * The author can be reached at djurfeldt@nada.kth.se
- * Mikael Djurfeldt, SANS/NADA KTH, 10044 STOCKHOLM, SWEDEN
- */
+ * Mikael Djurfeldt, SANS/NADA KTH, 10044 STOCKHOLM, SWEDEN */
 \f
 
-#include "__scm.h"
+#include "libguile/__scm.h"
 
 \f
 
-typedef struct scm_option
+typedef struct scm_option_t
 {
   int type;
   char *name;
-  int val;
-  SCM sym;
-} scm_option;
+
+  /*
+    schizophrenic use: both SCM and int
+   */
+  scm_bits_t val;
+  /* SCM val */
+  char *doc;
+} scm_option_t;
+
+#if (SCM_DEBUG_DEPRECATED == 0)
+# define scm_option scm_option_t
+#endif
 
 #define SCM_OPTION_BOOLEAN 0
 #define SCM_OPTION_INTEGER 1
+#define SCM_OPTION_SCM     2
 
-#ifdef __STDC__
-extern SCM scm_change_options (SCM new_mode, scm_option options[], int n, char *s);
-extern void scm_init_opts (SCM (*func) (SCM), scm_option options[], int n);
+
+extern SCM scm_options (SCM new_mode, scm_option_t options[], int n, const char *s);
+extern void scm_init_opts (SCM (*func) (SCM), scm_option_t options[], int n);
 extern void scm_init_options (void);
-#else /* STDC */
-extern SCM scm_change_options ();
-extern void scm_init_opts ();
-extern void scm_init_options ();
-#endif /* STDC */
 
 #endif /* OPTIONSH */
+
+/*
+  Local Variables:
+  c-file-style: "gnu"
+  End:
+*/