1999-09-08 Gary Houston <ghouston@easynet.co.uk>

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

diff --git a/libguile/variable.h b/libguile/variable.h
index b9d84fd..b63922b 100644 (file)
--- a/libguile/variable.h
+++ b/libguile/variable.h
@@ -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.
@@ -40,10 +41,9 @@
  *
  * 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.  
- */
+ * If you do not wish that, delete this exception notice.  */
 \f
-#include "__scm.h"
+#include "libguile/__scm.h"
 
 \f
 
@@ -54,34 +54,18 @@ extern int scm_tc16_variable;
 
 #define SCM_VARVCELL(V)        SCM_CDR(V)
 #define SCM_VARIABLEP(X)       (scm_tc16_variable == SCM_CAR(X))
-#define SCM_UDSCM_VARIABLEP(X)         (SCM_VARIABLEP(X) && SCM_UNBNDP (SCM_CDR (SCM_VARVCELL (X))))
-#define SCM_DEFSCM_VARIABLEP(X)        (SCM_VARIABLEP(X) && !SCM_UNBNDP (SCM_CDR (SCM_VARVCELL (X))))
+#define SCM_UDVARIABLEP(X)     (SCM_VARIABLEP(X) && SCM_UNBNDP (SCM_CDR (SCM_VARVCELL (X))))
+#define SCM_DEFVARIABLEP(X)    (SCM_VARIABLEP(X) && !SCM_UNBNDP (SCM_CDR (SCM_VARVCELL (X))))
 
 \f
-#ifdef __STDC__
-extern SCM scm_make_variable (SCM init, SCM name_hint);
-extern SCM scm_make_udvariable (SCM name_hint);
-extern SCM scm_variable_p (SCM obj);
-extern SCM scm_variable_ref (SCM var);
-extern SCM scm_variable_set_x (SCM var, SCM val);
-extern SCM scm_builtin_variable (SCM name);
-extern SCM scm_variable_bound_p (SCM var);
-extern void scm_init_variable (void);
-
-#else /* STDC */
-extern SCM scm_make_variable ();
-extern SCM scm_make_udvariable ();
-extern SCM scm_variable_p ();
-extern SCM scm_variable_ref ();
-extern SCM scm_variable_set_x ();
-extern SCM scm_builtin_variable ();
-extern SCM scm_variable_bound_p ();
-extern void scm_init_variable ();
-
-#endif /* STDC */
-
-
-
 
+extern SCM scm_make_variable SCM_P ((SCM init, SCM name_hint));
+extern SCM scm_make_undefined_variable SCM_P ((SCM name_hint));
+extern SCM scm_variable_p SCM_P ((SCM obj));
+extern SCM scm_variable_ref SCM_P ((SCM var));
+extern SCM scm_variable_set_x SCM_P ((SCM var, SCM val));
+extern SCM scm_builtin_variable SCM_P ((SCM name));
+extern SCM scm_variable_bound_p SCM_P ((SCM var));
+extern void scm_init_variable SCM_P ((void));
 
 #endif  /* VARIABLEH */