X-Git-Url: https://git.hcoop.net/bpt/guile.git/blobdiff_plain/7866a09b5b355ea277d2dd780b24e98f647329d4..10fb3386dd186244becc493d83c291b9bec2075e:/libguile/gsubr.h

diff --git a/libguile/gsubr.h b/libguile/gsubr.h
dissimilarity index 89%
index 2a0c47de4..e7488052b 100644
--- a/libguile/gsubr.h
+++ b/libguile/gsubr.h
@@ -1,73 +1,62 @@
-/* classes: h_files */
-
-#ifndef GSUBRH
-#define GSUBRH
-/*	Copyright (C) 1995,1996,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,
- * 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.
- *
- * The exception is that, if you link the GUILE library with other files
- * to produce an executable, this does not by itself cause the
- * resulting executable to be covered by the GNU General Public License.
- * Your use of that executable is in no way restricted on account of
- * linking the GUILE library code into it.
- *
- * This exception does not however invalidate any other reasons why
- * the executable file might be covered by the GNU General Public License.
- *
- * This exception applies only to the code released by the
- * Free Software Foundation under the name GUILE.  If you copy
- * code from other Free Software Foundation releases into a copy of
- * GUILE, as the General Public License permits, the exception does
- * not apply to the code that you add in this way.  To avoid misleading
- * anyone as to the status of such modified files, you must delete
- * this exception notice from them.
- *
- * 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.  */
-
-
-#include "libguile/__scm.h"
-
-
-
-#define SCM_GSUBR_MAKTYPE(req, opt, rst) ((req)|((opt)<<4)|((rst)<<8))
-#define SCM_GSUBR_REQ(x) ((int)(x)&0xf)
-#define SCM_GSUBR_OPT(x) (((int)(x)&0xf0)>>4)
-#define SCM_GSUBR_REST(x) ((int)(x)>>8)
-
-#define SCM_GSUBR_MAX 10
-#define SCM_GSUBR_TYPE(cclo) (SCM_VELTS(cclo)[1])
-#define SCM_GSUBR_PROC(cclo) (SCM_VELTS(cclo)[2])
-
-extern SCM scm_f_gsubr_apply;
-
-extern SCM scm_make_gsubr (const char *name, int req, int opt, int rst,
-                           SCM (*fcn)());
-extern SCM scm_make_gsubr_with_generic (const char *name,
-                                        int req,
-                                        int opt,
-                                        int rst,
-                                        SCM (*fcn)(),
-                                        SCM *gf);
-extern SCM scm_gsubr_apply (SCM args);
-extern void scm_init_gsubr (void);
-
-#endif  /* GSUBRH */
+/* classes: h_files */
+
+#ifndef SCM_GSUBR_H
+#define SCM_GSUBR_H
+
+/* Copyright (C) 1995,1996,1998,2000,2001, 2006 Free Software Foundation, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+
+
+#include "libguile/__scm.h"
+
+
+
+#define SCM_GSUBR_MAKTYPE(req, opt, rst) ((req)|((opt)<<4)|((rst)<<8))
+#define SCM_GSUBR_REQ(x) ((long)(x)&0xf)
+#define SCM_GSUBR_OPT(x) (((long)(x)&0xf0)>>4)
+#define SCM_GSUBR_REST(x) ((long)(x)>>8)
+
+#define SCM_GSUBR_MAX 10
+#define SCM_GSUBR_TYPE(cclo) (SCM_CCLO_REF ((cclo), 1))
+#define SCM_SET_GSUBR_TYPE(cclo, type) (SCM_CCLO_SET ((cclo), 1, (type)))
+#define SCM_GSUBR_PROC(cclo) (SCM_CCLO_REF ((cclo), 2))
+#define SCM_SET_GSUBR_PROC(cclo, proc) (SCM_CCLO_SET ((cclo), 2, (proc)))
+
+SCM_API SCM scm_f_gsubr_apply;
+
+SCM_API SCM scm_c_make_gsubr (const char *name, 
+			      int req, int opt, int rst, SCM (*fcn) ());
+SCM_API SCM scm_c_make_gsubr_with_generic (const char *name,
+					   int req, int opt, int rst,
+					   SCM (*fcn) (), SCM *gf);
+SCM_API SCM scm_c_define_gsubr (const char *name, 
+				int req, int opt, int rst, SCM (*fcn) ());
+SCM_API SCM scm_c_define_gsubr_with_generic (const char *name,
+					     int req, int opt, int rst,
+					     SCM (*fcn) (), SCM *gf);
+
+SCM_API SCM scm_gsubr_apply (SCM args);
+SCM_API void scm_init_gsubr (void);
+
+#endif  /* SCM_GSUBR_H */
+
+/*
+  Local Variables:
+  c-file-style: "gnu"
+  End:
+*/