1 files changed, 7 insertions, 22 deletions

diff --git a/src/gsql_lib.c b/src/gsql_lib.c
index c988b2e..a6103b2 100644
--- a/src/gsql_lib.c
+++ b/src/gsql_lib.c
@@ -1,19 +1,18 @@
 /* This file is part of guile-sql.
    Copyright (C) 2002 Sergey Poznyakoff
 
-   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 of the License, or
-   (at your option) any later version.
+   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 3 of the License, 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 program; if not, write to the Free Software Foundation, Inc.,
-   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */
+   You should have received a copy of the GNU General Public License along
+   with this program. If not, see <http://www.gnu.org/licenses/>. */
 
 #ifdef HAVE_CONFIG_H
 # include <config.h>
@@ -26,7 +25,7 @@ scm_makenum (unsigned long val)
 #ifndef HAVE_SCM_LONG2NUM
 {
         if (SCM_FIXABLE ((long) val))
-                return SCM_MAKINUM (val);
+                return scm_from_int (val);
 
 #ifdef SCM_BIGDIG
         return scm_i_long2big (val);
@@ -40,20 +39,6 @@ scm_makenum (unsigned long val)
 }
 #endif
 
-/*
- * Chop off trailing whitespace. Return length of the resulting string
- */
-int
-chop(char *str)
-{
-  int len;
-  
-  for (len = strlen(str); len > 0 && isspace(str[len-1]); len--)
-    ;
-  str[len] = 0;
-  return len;
-}
-
 extern void
 sql_init()
 {