* eval.c (RETURN): Wrap in do{}while(0) in order to make it

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

diff --git a/libguile/lang.h b/libguile/lang.h
index 4062c77..ae10869 100644 (file)
--- a/libguile/lang.h
+++ b/libguile/lang.h
@@ -1,19 +1,20 @@
 /* classes: h_files */
 
-#ifndef LANGH
-#define LANGH
-/*     Copyright (C) 1998 Free Software Foundation, Inc.
- * 
+#ifndef SCM_LANG_H
+#define SCM_LANG_H
+
+/* Copyright (C) 1998 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
  * the Free Software Foundation; either version 2, or (at your option)
  * any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * 
+ *
  * 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, Inc., 59 Temple Place, Suite 330,
@@ -42,33 +43,34 @@
  * 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.  */
+
 \f
 
 #include "libguile/__scm.h"
 
 \f
 
-extern SCM scm_lisp_nil;
-extern SCM scm_lisp_t;
+SCM_API SCM scm_lisp_nil;
+SCM_API SCM scm_lisp_t;
 
-#define SCM_NILP(x) ((x) == scm_lisp_nil)
+#define SCM_NILP(x) (SCM_EQ_P ((x), scm_lisp_nil))
 #define SCM_NILNULLP(x) (SCM_NILP (x) || SCM_NULLP (x))
-#define SCM_NIL2EOL(x, tmp) ((tmp = (x)) == scm_lisp_nil ? SCM_EOL : tmp)
+#define SCM_NIL2EOL(x, tmp) (SCM_EQ_P ((tmp = (x)), scm_lisp_nil) ? SCM_EOL : tmp)
 #define SCM_EOL2NIL(x, tmp) (SCM_NULLP (tmp = (x)) ? scm_lisp_nil : tmp)
 #define SCM_EOL_IFY(x, tmp) (tmp = (x), SCM_NILP (tmp) ? SCM_EOL : tmp)
 #define SCM_NIL_IFY(x, tmp) (tmp = (x), SCM_NILP (tmp) ? scm_lisp_nil : tmp)
 
 \f
 
-extern SCM scm_nil_cons (SCM x, SCM y);
-extern SCM scm_nil_car (SCM x);
-extern SCM scm_nil_cdr (SCM x);
-extern SCM scm_null (SCM x);
-extern SCM scm_m_while (SCM exp, SCM env);
-extern SCM scm_nil_eq (SCM x, SCM y);
-extern void scm_init_lang (void);
+SCM_API SCM scm_nil_cons (SCM x, SCM y);
+SCM_API SCM scm_nil_car (SCM x);
+SCM_API SCM scm_nil_cdr (SCM x);
+SCM_API SCM scm_null (SCM x);
+SCM_API SCM scm_m_while (SCM exp, SCM env);
+SCM_API SCM scm_nil_eq (SCM x, SCM y);
+SCM_API void scm_init_lang (void);
 
-#endif  /* PAIRSH */
+#endif  /* SCM_LANG_H */
 
 /*
   Local Variables: