From e6e2e95aa53f876e25bee2b0f867350c4a2ddf7a Mon Sep 17 00:00:00 2001 From: Mikael Djurfeldt Date: Sat, 10 Mar 2001 16:56:09 +0000 Subject: [PATCH] * _scm.h: Removed #include . * 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 in these 20 out of 100 files. --- libguile/ChangeLog | 13 +++++++++++++ libguile/_scm.h | 7 +------ libguile/error.c | 5 ++--- libguile/filesys.c | 4 +++- libguile/gc.c | 4 +++- libguile/ioext.c | 2 ++ libguile/iselect.c | 1 + libguile/net_db.c | 8 +++----- libguile/ports.c | 2 ++ libguile/posix.c | 4 +++- libguile/print.c | 4 +++- libguile/putenv.c | 5 +---- libguile/scmsigs.c | 4 +++- libguile/script.c | 4 +++- libguile/simpos.c | 4 +++- libguile/smob.c | 2 ++ libguile/socket.c | 4 +++- libguile/srcprop.c | 4 +++- libguile/stime.c | 6 +++--- libguile/strop.c | 4 +++- libguile/unif.c | 2 ++ libguile/vports.c | 4 +++- 22 files changed, 65 insertions(+), 32 deletions(-) diff --git a/libguile/ChangeLog b/libguile/ChangeLog index 18e0ac098..b4025606c 100644 --- a/libguile/ChangeLog +++ b/libguile/ChangeLog @@ -1,3 +1,16 @@ +2001-03-10 Mikael Djurfeldt + + * _scm.h: Removed #include . + + * 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 in these 20 out of 100 files. + 2001-03-10 Gary Houston * 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 f87a303e7..3ffdc64c4 100644 --- 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 - /* 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 56454c844..ee8ef2f10 100644 --- 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 @@ #include +#include #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 a2042c314..737695b3c 100644 --- 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 @@ #include +#include + #include "libguile/_scm.h" #include "libguile/smob.h" #include "libguile/feature.h" diff --git a/libguile/gc.c b/libguile/gc.c index bf554aa05..c414c7552 100644 --- 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 @@ #include +#include #include + #include "libguile/_scm.h" #include "libguile/eval.h" #include "libguile/stime.h" diff --git a/libguile/ioext.c b/libguile/ioext.c index c3d976964..31f874c58 100644 --- a/libguile/ioext.c +++ b/libguile/ioext.c @@ -44,6 +44,8 @@ +#include + #include "libguile/_scm.h" #include "libguile/ioext.h" #include "libguile/fports.h" diff --git a/libguile/iselect.c b/libguile/iselect.c index 50ea3dc11..867863594 100644 --- a/libguile/iselect.c +++ b/libguile/iselect.c @@ -40,6 +40,7 @@ * If you do not wish that, delete this exception notice. */ #include +#include #include #include diff --git a/libguile/net_db.c b/libguile/net_db.c index ba9599671..a450c3c05 100644 --- 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 @@ */ +#include + #include "libguile/_scm.h" #include "libguile/feature.h" #include "libguile/strings.h" @@ -69,10 +71,6 @@ #include #include -#if !defined (HAVE_H_ERRNO) -extern int h_errno; -#endif - #ifndef STDC_HEADERS diff --git a/libguile/ports.c b/libguile/ports.c index 313dea63e..e8c739b30 100644 --- a/libguile/ports.c +++ b/libguile/ports.c @@ -46,6 +46,8 @@ /* Headers. */ #include +#include + #include "libguile/_scm.h" #include "libguile/eval.h" #include "libguile/objects.h" diff --git a/libguile/posix.c b/libguile/posix.c index c8f969ac6..efc3f4635 100644 --- 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 +#include + #include "libguile/_scm.h" #include "libguile/fports.h" #include "libguile/scmsigs.h" diff --git a/libguile/print.c b/libguile/print.c index 0d822c58b..0fdb24862 100644 --- 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 @@ +#include + #include "libguile/_scm.h" #include "libguile/chars.h" #include "libguile/continuations.h" diff --git a/libguile/putenv.c b/libguile/putenv.c index 1c185502a..bc59233dd 100644 --- 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 #include -#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 baa597e31..ce5280146 100644 --- 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 @@ #include +#include + #include "libguile/_scm.h" #include "libguile/async.h" diff --git a/libguile/script.c b/libguile/script.c index 5e56c03b3..0db21e994 100644 --- 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 +#include #include + #include "libguile/_scm.h" #include "libguile/gh.h" #include "libguile/load.h" diff --git a/libguile/simpos.c b/libguile/simpos.c index db0c04beb..e847ce0d5 100644 --- 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 @@ +#include + #include "libguile/_scm.h" #include "libguile/scmsigs.h" diff --git a/libguile/smob.c b/libguile/smob.c index 87f721207..f7d00e910 100644 --- a/libguile/smob.c +++ b/libguile/smob.c @@ -45,6 +45,8 @@ #include +#include + #include "libguile/_scm.h" #include "libguile/objects.h" diff --git a/libguile/socket.c b/libguile/socket.c index 0f90e6416..784096484 100644 --- 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 @@ +#include + #include "libguile/_scm.h" #include "libguile/unif.h" #include "libguile/feature.h" diff --git a/libguile/srcprop.c b/libguile/srcprop.c index 41cd36cc2..1b9aa2bbe 100644 --- 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 @@ +#include + #include "libguile/_scm.h" #include "libguile/smob.h" #include "libguile/alist.h" diff --git a/libguile/stime.c b/libguile/stime.c index d797bf6c3..d723da8d0 100644 --- 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 @@ #include +#include + #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 01665dd97..3ff1726c8 100644 --- 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 +#include + #include "libguile/_scm.h" #include "libguile/chars.h" #include "libguile/strings.h" diff --git a/libguile/unif.c b/libguile/unif.c index 7e4e1a8bc..f45236078 100644 --- a/libguile/unif.c +++ b/libguile/unif.c @@ -52,7 +52,9 @@ #include +#include #include + #include "libguile/_scm.h" #include "libguile/chars.h" #include "libguile/eval.h" diff --git a/libguile/vports.c b/libguile/vports.c index cdb43598d..962759b23 100644 --- 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 @@ #include +#include + #include "libguile/_scm.h" #include "libguile/eval.h" #include "libguile/chars.h" -- 2.20.1