From 4a11acf04705a07b78d8ddf71cfc90ce2607cdd8 Mon Sep 17 00:00:00 2001 From: Paul Smith Date: Wed, 11 Sep 2002 16:55:44 +0000 Subject: Fix HAVE_BROKEN_RESTART logic. Fix hash.h typos (only noticed when using Windows). Update .cvsignore files. --- .cvsignore | 5 +++-- ChangeLog | 10 ++++++++++ config/.cvsignore | 4 ++++ doc/.cvsignore | 7 +++++++ glob/.cvsignore | 3 ++- hash.h | 6 +++--- make.h | 9 +++++++++ misc.c | 4 ++-- po/.cvsignore | 4 +++- tests/.cvsignore | 1 + 10 files changed, 44 insertions(+), 9 deletions(-) create mode 100644 config/.cvsignore create mode 100644 doc/.cvsignore create mode 100644 tests/.cvsignore diff --git a/.cvsignore b/.cvsignore index 35c5d23..7fc3895 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,6 +1,6 @@ *.gz *.Z *.tar *.tgz =* -TODO COPYING* +TODO COPYING* ABOUT-NLS make-3* make-test* *.info *.info-* stamp-* @@ -12,7 +12,8 @@ makebook* *.cp *.cps *.fn *.fns *.vr *.vrs *.tp *.tps *.ky *.kys *.pg *.pgs README README.DOS README.W32 -aclocal.m4 config.h.in config.h config.status config.cache configure +aclocal.m4 autom4te.cache +config.h.in config.h config.status config.cache configure Makefile.in Makefile build.sh.in build.sh SMakefile NMakefile Makefile.DOS diff --git a/ChangeLog b/ChangeLog index 4891382..b539477 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +2002-09-11 Paul D. Smith + + * hash.h (STRING_COMPARE, ISTRING_COMPARE, STRING_N_COMPARE): Fix + macro to use RESULT instead of the incorrect _RESULT_. + + * make.h (HAVE_BROKEN_RESTART): Add prototypes for atomic_stat() + and atomic_readdir(). We need to #include dirent.h to get this to + work. + * misc.c (atomic_readdir): Fix typos. + 2002-09-10 Paul D. Smith * read.c (eval): Expand variable lists given to export and diff --git a/config/.cvsignore b/config/.cvsignore new file mode 100644 index 0000000..3fa7c2f --- /dev/null +++ b/config/.cvsignore @@ -0,0 +1,4 @@ +*.m4 +config.* + +Makefile Makefile.in diff --git a/doc/.cvsignore b/doc/.cvsignore new file mode 100644 index 0000000..94240d6 --- /dev/null +++ b/doc/.cvsignore @@ -0,0 +1,7 @@ +Makefile Makefile.in +fdl.texi make-stds.texi texinfo.tex +make.info* +make*.html +make.aux make.cp make.cps make.fn make.fns make.ky +make.pg make.toc make.tp make.vr make.log +make.dvi make.ps make.pdf diff --git a/glob/.cvsignore b/glob/.cvsignore index e8e7be4..efc8094 100644 --- a/glob/.cvsignore +++ b/glob/.cvsignore @@ -1 +1,2 @@ -.deps Makefile.in +Makefile Makefile.in +.deps diff --git a/hash.h b/hash.h index c1b3ea4..405f1da 100644 --- a/hash.h +++ b/hash.h @@ -104,7 +104,7 @@ extern void *hash_deleted_item; } while (0) #define STRING_COMPARE(X, Y, RESULT) do { \ - _RESULT_ = strcmp ((X), (Y)); \ + RESULT = strcmp ((X), (Y)); \ } while (0) #define return_STRING_COMPARE(X, Y) do { \ return strcmp ((X), (Y)); \ @@ -140,7 +140,7 @@ extern void *hash_deleted_item; } while (0) #define STRING_N_COMPARE(X, Y, N, RESULT) do { \ - _RESULT_ = strncmp ((X), (Y), (N)); \ + RESULT = strncmp ((X), (Y), (N)); \ } while (0) #define return_STRING_N_COMPARE(X, Y, N) do { \ return strncmp ((X), (Y), (N)); \ @@ -173,7 +173,7 @@ extern void *hash_deleted_item; } while (0) #define ISTRING_COMPARE(X, Y, RESULT) do { \ - _RESULT_ = strcmpi ((X), (Y)); \ + RESULT = strcmpi ((X), (Y)); \ } while (0) #define return_ISTRING_COMPARE(X, Y) do { \ return strcmpi ((X), (Y)); \ diff --git a/make.h b/make.h index 2e354c9..6648ea0 100644 --- a/make.h +++ b/make.h @@ -547,7 +547,16 @@ extern int handling_fatal_signal; #ifdef HAVE_BROKEN_RESTART +/* Here we make an assumption that a system with a broken SA_RESTART has + dirent.h. Right now the only system I know of in this category is PTX, and + it does have dirent.h. +*/ +#include + #define stat(_f,_b) atomic_stat ((_f), (_b)) #define readdir(_d) atomic_readdir (_d) +extern int atomic_stat PARAMS ((const char *file, struct stat *buf)); +extern struct dirent *atomic_readdir PARAMS ((DIR *dir)); + #endif diff --git a/misc.c b/misc.c index 669dabc..789bb70 100644 --- a/misc.c +++ b/misc.c @@ -879,11 +879,11 @@ atomic_stat(file, buf) struct dirent * atomic_readdir(dir) - DIR *file; + DIR *dir; { struct dirent *r; - while ((r = readdir (file, buf)) == NULL) + while ((r = readdir (dir)) == NULL) if (errno != EINTR) break; diff --git a/po/.cvsignore b/po/.cvsignore index 32b4d6f..d01e6b3 100644 --- a/po/.cvsignore +++ b/po/.cvsignore @@ -1,4 +1,6 @@ *.gmo *.mo *.pot *.po -Makefile.in Makefile +Makefile Makefile.in Makefile.in.in +Rules-quot +*.sed *.sin *.header POTFILES diff --git a/tests/.cvsignore b/tests/.cvsignore new file mode 100644 index 0000000..b8f99f5 --- /dev/null +++ b/tests/.cvsignore @@ -0,0 +1 @@ +work -- cgit v1.2.3