* _scm.h: Removed #include <errno.h>.

* error.c, net_db.c, putenv.c, stime.c: Removed declaration of
errno variable (can be a macro on some systems, for example when
using linux libc with threads).

* error.c, filesys.c, gc.c, ioext.c, iselect.c, net_db.c, ports.c,
posix.c, print.c, putenv.c, scmsigs.c, script.c, simpos.c, smob.c,
socket.c, srcprop.c, stime.c, strop.c, unif.c, vports.c: Added
#include <errno.h> in these 20 out of 100 files.

diff --git a/libguile/ChangeLog b/libguile/ChangeLog
index 18e0ac0..b402560 100644 (file)
--- a/libguile/ChangeLog
+++ b/libguile/ChangeLog
@@ -1,3 +1,16 @@
+2001-03-10  Mikael Djurfeldt  <mdj@linnaeus.mit.edu>
+
+       * _scm.h: Removed #include <errno.h>.
+
+       * error.c, net_db.c, putenv.c, stime.c: Removed declaration of
+       errno variable (can be a macro on some systems, for example when
+       using linux libc with threads).
+
+       * error.c, filesys.c, gc.c, ioext.c, iselect.c, net_db.c, ports.c,
+       posix.c, print.c, putenv.c, scmsigs.c, script.c, simpos.c, smob.c,
+       socket.c, srcprop.c, stime.c, strop.c, unif.c, vports.c: Added
+       #include <errno.h> in these 20 out of 100 files.
+       
 2001-03-10  Gary Houston  <ghouston@arglist.com>
 
        * socket.c: add a definition of SUN_LEN (from glibc) for when it's

diff --git a/libguile/_scm.h b/libguile/_scm.h
index f87a303..3ffdc64 100644 (file)
--- a/libguile/_scm.h
+++ b/libguile/_scm.h
@@ -2,7 +2,7 @@
 
 #ifndef _SCMH
 #define _SCMH
-/*     Copyright (C) 1995,1996, 2000 Free Software Foundation, Inc.
+/*     Copyright (C) 1995,1996, 2000, 2001 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
@@ -76,11 +76,6 @@
 #endif
 #include "libguile/snarf.h"    /* Everyone snarfs. */
 
-/* On VMS, GNU C's errno.h contains a special hack to get link attributes
- * for errno correct for linking to the C RTL.
- */
-#include <errno.h>
-
 /* SCM_SYSCALL retries system calls that have been interrupted (EINTR).
    However this can be avoided if the operating system can restart
    system calls automatically.  We assume this is the case if

diff --git a/libguile/error.c b/libguile/error.c
index 56454c8..ee8ef2f 100644 (file)
--- a/libguile/error.c
+++ b/libguile/error.c
@@ -1,4 +1,4 @@
-/*     Copyright (C) 1995,1996,1997,1998, 2000 Free Software Foundation, Inc.
+/*     Copyright (C) 1995,1996,1997,1998, 2000, 2001 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
@@ -45,6 +45,7 @@
 \f
 
 #include <stdio.h>
+#include <errno.h>
 
 #include "libguile/_scm.h"
 #include "libguile/pairs.h"
@@ -67,8 +68,6 @@
  */
 
 
-extern int errno;
-
 /* All errors should pass through here.  */
 void
 scm_error (SCM key, const char *subr, const char *message, SCM args, SCM rest)

diff --git a/libguile/filesys.c b/libguile/filesys.c
index a2042c3..737695b 100644 (file)
--- a/libguile/filesys.c
+++ b/libguile/filesys.c
@@ -1,4 +1,4 @@
-/*     Copyright (C) 1996, 1997, 1998, 1999, 2000 Free Software Foundation, Inc.
+/*     Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001 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
@@ -44,6 +44,8 @@
 
 \f
 #include <stdio.h>
+#include <errno.h>
+
 #include "libguile/_scm.h"
 #include "libguile/smob.h"
 #include "libguile/feature.h"

diff --git a/libguile/gc.c b/libguile/gc.c
index bf554aa..c414c75 100644 (file)
--- a/libguile/gc.c
+++ b/libguile/gc.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1995, 96, 97, 98, 99, 2000 Free Software Foundation, Inc.
+/* Copyright (C) 1995, 96, 97, 98, 99, 2000, 2001 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
@@ -51,7 +51,9 @@
 
 \f
 #include <stdio.h>
+#include <errno.h>
 #include <string.h>
+
 #include "libguile/_scm.h"
 #include "libguile/eval.h"
 #include "libguile/stime.h"

diff --git a/libguile/ioext.c b/libguile/ioext.c
index c3d9769..31f874c 100644 (file)
--- a/libguile/ioext.c
+++ b/libguile/ioext.c
@@ -44,6 +44,8 @@
 
 \f
 
+#include <errno.h>
+
 #include "libguile/_scm.h"
 #include "libguile/ioext.h"
 #include "libguile/fports.h"

diff --git a/libguile/iselect.c b/libguile/iselect.c
index 50ea3dc..8678635 100644 (file)
--- a/libguile/iselect.c
+++ b/libguile/iselect.c
@@ -40,6 +40,7 @@
  * If you do not wish that, delete this exception notice.  */
 \f
 #include <stdio.h>
+#include <errno.h>
 #include <limits.h>
 #include <string.h>
 

diff --git a/libguile/net_db.c b/libguile/net_db.c
index ba95996..a450c3c 100644 (file)
--- a/libguile/net_db.c
+++ b/libguile/net_db.c
@@ -1,5 +1,5 @@
 /* "net_db.c" network database support
- * Copyright (C) 1995, 96, 97, 98, 99, 2000 Free Software Foundation, Inc.
+ * Copyright (C) 1995, 96, 97, 98, 99, 2000, 2001 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
@@ -51,6 +51,8 @@
  */
 \f
 
+#include <errno.h>
+
 #include "libguile/_scm.h"
 #include "libguile/feature.h"
 #include "libguile/strings.h"
@@ -69,10 +71,6 @@
 #include <netinet/in.h>
 #include <arpa/inet.h>
 
-#if !defined (HAVE_H_ERRNO)
-extern int h_errno;
-#endif
-
 \f
 
 #ifndef STDC_HEADERS

diff --git a/libguile/ports.c b/libguile/ports.c
index 313dea6..e8c739b 100644 (file)
--- a/libguile/ports.c
+++ b/libguile/ports.c
@@ -46,6 +46,8 @@
 /* Headers.  */
 
 #include <stdio.h>
+#include <errno.h>
+
 #include "libguile/_scm.h"
 #include "libguile/eval.h"
 #include "libguile/objects.h"

diff --git a/libguile/posix.c b/libguile/posix.c
index c8f969a..efc3f46 100644 (file)
--- a/libguile/posix.c
+++ b/libguile/posix.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1995, 96, 97, 98, 99, 2000 Free Software Foundation, Inc.
+/* Copyright (C) 1995, 96, 97, 98, 99, 2000, 2001 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
@@ -48,6 +48,8 @@
 #define _GNU_SOURCE
 
 #include <stdio.h>
+#include <errno.h>
+
 #include "libguile/_scm.h"
 #include "libguile/fports.h"
 #include "libguile/scmsigs.h"

diff --git a/libguile/print.c b/libguile/print.c
index 0d822c5..0fdb248 100644 (file)
--- a/libguile/print.c
+++ b/libguile/print.c
@@ -1,4 +1,4 @@
-/*     Copyright (C) 1995-1999, 2000 Free Software Foundation, Inc.
+/*     Copyright (C) 1995-1999, 2000, 2001 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
@@ -44,6 +44,8 @@
 
 \f
 
+#include <errno.h>
+
 #include "libguile/_scm.h"
 #include "libguile/chars.h"
 #include "libguile/continuations.h"

diff --git a/libguile/putenv.c b/libguile/putenv.c
index 1c18550..bc59233 100644 (file)
--- a/libguile/putenv.c
+++ b/libguile/putenv.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991, 2000 Free Software Foundation, Inc.
+/* Copyright (C) 1991, 2000, 2001 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
@@ -24,9 +24,6 @@
 
 #include <sys/types.h>
 #include <errno.h>
-#ifndef errno
-extern int errno;
-#endif
 
 /* Don't include stdlib.h for non-GNU C libraries because some of them
    contain conflicting prototypes for getopt.

diff --git a/libguile/scmsigs.c b/libguile/scmsigs.c
index baa597e..ce52801 100644 (file)
--- a/libguile/scmsigs.c
+++ b/libguile/scmsigs.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000 Free Software Foundation, Inc.
+/* Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001 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
@@ -45,6 +45,8 @@
 \f
 
 #include <signal.h>
+#include <errno.h>
+
 #include "libguile/_scm.h"
 
 #include "libguile/async.h"

diff --git a/libguile/script.c b/libguile/script.c
index 5e56c03..0db21e9 100644 (file)
--- a/libguile/script.c
+++ b/libguile/script.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1994, 1995, 1996, 1997, 1998, 2000 Free Software Foundation, Inc.
+/* Copyright (C) 1994, 1995, 1996, 1997, 1998, 2000, 2001 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)
@@ -45,7 +45,9 @@
    gjb@cs.washington.edu, http://www.cs.washington.edu/homes/gjb */
 
 #include <stdio.h>
+#include <errno.h>
 #include <ctype.h>
+
 #include "libguile/_scm.h"
 #include "libguile/gh.h"
 #include "libguile/load.h"

diff --git a/libguile/simpos.c b/libguile/simpos.c
index db0c04b..e847ce0 100644 (file)
--- a/libguile/simpos.c
+++ b/libguile/simpos.c
@@ -1,4 +1,4 @@
-/*     Copyright (C) 1995,1996,1997,1998, 2000 Free Software Foundation, Inc.
+/*     Copyright (C) 1995,1996,1997,1998, 2000, 2001 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
@@ -44,6 +44,8 @@
 
 \f
 
+#include <errno.h>
+
 #include "libguile/_scm.h"
 
 #include "libguile/scmsigs.h"

diff --git a/libguile/smob.c b/libguile/smob.c
index 87f7212..f7d00e9 100644 (file)
--- a/libguile/smob.c
+++ b/libguile/smob.c
@@ -45,6 +45,8 @@
 \f
 
 #include <stdio.h>
+#include <errno.h>
+
 #include "libguile/_scm.h"
 
 #include "libguile/objects.h"

diff --git a/libguile/socket.c b/libguile/socket.c
index 0f90e64..7840964 100644 (file)
--- a/libguile/socket.c
+++ b/libguile/socket.c
@@ -1,4 +1,4 @@
-/*     Copyright (C) 1996,1997,1998, 2000 Free Software Foundation, Inc.
+/*     Copyright (C) 1996,1997,1998, 2000, 2001 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
@@ -44,6 +44,8 @@
 
 \f
 
+#include <errno.h>
+
 #include "libguile/_scm.h"
 #include "libguile/unif.h"
 #include "libguile/feature.h"

diff --git a/libguile/srcprop.c b/libguile/srcprop.c
index 41cd36c..1b9aa2b 100644 (file)
--- a/libguile/srcprop.c
+++ b/libguile/srcprop.c
@@ -1,4 +1,4 @@
-/*     Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000 Free Software Foundation
+/*     Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001 Free Software Foundation
  * 
  * 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
@@ -47,6 +47,8 @@
 
 \f
 
+#include <errno.h>
+
 #include "libguile/_scm.h"
 #include "libguile/smob.h"
 #include "libguile/alist.h"

diff --git a/libguile/stime.c b/libguile/stime.c
index d797bf6..d723da8 100644 (file)
--- a/libguile/stime.c
+++ b/libguile/stime.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1995,1996,1997,1998, 1999, 2000 Free Software Foundation, Inc.
+/* Copyright (C) 1995,1996,1997,1998, 1999, 2000, 2001 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
@@ -45,6 +45,8 @@
 \f
 
 #include <stdio.h>
+#include <errno.h>
+
 #include "libguile/_scm.h"
 #include "libguile/feature.h"
 #include "libguile/strings.h"
@@ -128,8 +130,6 @@ timet mytime()
 # endif
 #endif
 
-extern int errno;
-
 #ifdef HAVE_FTIME
 struct timeb scm_your_base = {0};
 #else

diff --git a/libguile/strop.c b/libguile/strop.c
index 01665dd..3ff1726 100644 (file)
--- a/libguile/strop.c
+++ b/libguile/strop.c
@@ -1,6 +1,6 @@
 /* classes: src_files */
 
-/*     Copyright (C) 1994, 1996, 1997, 1999, 2000 Free Software Foundation, Inc.
+/*     Copyright (C) 1994, 1996, 1997, 1999, 2000, 2001 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
@@ -23,6 +23,8 @@ Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
 
 \f
 
+#include <errno.h>
+
 #include "libguile/_scm.h"
 #include "libguile/chars.h"
 #include "libguile/strings.h"

diff --git a/libguile/unif.c b/libguile/unif.c
index 7e4e1a8..f452360 100644 (file)
--- a/libguile/unif.c
+++ b/libguile/unif.c
@@ -52,7 +52,9 @@
 \f
 
 #include <stdio.h>
+#include <errno.h>
 #include <string.h>
+
 #include "libguile/_scm.h"
 #include "libguile/chars.h"
 #include "libguile/eval.h"

diff --git a/libguile/vports.c b/libguile/vports.c
index cdb4359..962759b 100644 (file)
--- a/libguile/vports.c
+++ b/libguile/vports.c
@@ -1,4 +1,4 @@
-/*     Copyright (C) 1995,1996,1998,1999, 2000 Free Software Foundation, Inc.
+/*     Copyright (C) 1995,1996,1998,1999, 2000, 2001 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
@@ -45,6 +45,8 @@
 \f
 
 #include <stdio.h>
+#include <errno.h>
+
 #include "libguile/_scm.h"
 #include "libguile/eval.h"
 #include "libguile/chars.h"