* validate.h

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

diff --git a/libguile/options.h b/libguile/options.h
index 5ab41c6..7450b73 100644 (file)
--- a/libguile/options.h
+++ b/libguile/options.h
@@ -2,7 +2,7 @@
 
 #ifndef OPTIONSH
 #define OPTIONSH
-/*     Copyright (C) 1995,1996 Free Software Foundation
+/*     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
@@ -51,21 +51,36 @@
 
 \f
 
-typedef struct scm_option
+typedef struct scm_option_t
 {
   int type;
   char *name;
-  unsigned long val;
+
+  /*
+    schizophrenic use: both SCM and int
+   */
+  scm_bits_t val;
+  /* SCM val */
   char *doc;
-} scm_option;
+} 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
 
 
-extern SCM scm_options (SCM new_mode, scm_option options[], int n, const 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);
 
 #endif /* OPTIONSH */
+
+/*
+  Local Variables:
+  c-file-style: "gnu"
+  End:
+*/