Import Debian changes 5b3-1debian/5b3-1

scm (5b3-1) unstable; urgency=low

  * New maintainer
  * New version
  * libc6

1 files changed, 53 insertions, 1 deletions

diff --git a/rgx.c b/rgx.c
index e766083..974116a 100644
--- a/rgx.c
+++ b/rgx.c
@@ -1,6 +1,54 @@
+/* Copyright (C) 1995, 1996, 1997 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, 675 Mass Ave, Cambridge, MA 02139, 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.  
+ */
+
+/* "rgx.c" regular expression matching using C regex library.
+   Author: Aubrey Jaffer */
+
 #include "scm.h"
 #include "regex.h"
 #include <stdio.h>
+/* added by Denys Duchier: for bcopy */
+#ifdef sun
+#include <strings.h>
+#endif
 
 static char rcsid[] =
    "$Id: rgx.c, v 1.20 1995/02/15 04:39:45 dpb Exp $";
@@ -104,7 +152,11 @@ static smobfuns rgxsmob = {markregex, fregex, prinregex};
 SCM lregerror(scode)
      SCM scode;
 {
-  int code, len;
+  int code;
+  /* added by Denys Duchier: conditional declaration */
+#ifdef __REGEXP_LIBRARY_H__
+  int len;
+#endif
   SCM str;
   ASSERT(INUMP(scode), scode, ARG1, s_regerror);
   code = INUM(scode);