[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Bug-gnulib] merge of acl.c, alloca.c, alloca_.h, regex.c from coreutils
From: |
Paul Eggert |
Subject: |
[Bug-gnulib] merge of acl.c, alloca.c, alloca_.h, regex.c from coreutils |
Date: |
09 Aug 2003 02:06:57 -0700 |
User-agent: |
Gnus/5.09 (Gnus v5.9.0) Emacs/21.3 |
I merged the following changes from coreutils into gnulib.
There are still some other changes to merge.
2003-08-09 Paul Eggert <address@hidden>
Merge some files from coreutils. These changes were
originally made by Jim Meyering.
* lib/acl.c: Include <sys/types.h> before <sys/stat.h>;
many older Unixes require this.
* lib/alloca.c (alloca): Remove cast to argument of free;
no longer needed in C89.
* lib/alloca_.h, lib/regex.h: Fix white space to match
what GNU indent does.
Index: lib/ChangeLog
===================================================================
RCS file: /cvsroot/gnulib/gnulib/lib/ChangeLog,v
retrieving revision 1.523
diff -p -u -r1.523 ChangeLog
--- lib/ChangeLog 6 Aug 2003 04:34:47 -0000 1.523
+++ lib/ChangeLog 9 Aug 2003 08:56:37 -0000
@@ -1,3 +1,14 @@
+2003-08-09 Paul Eggert <address@hidden>
+
+ Merge some files from coreutils. These changes were
+ originally made by Jim Meyering.
+ * lib/acl.c: Include <sys/types.h> before <sys/stat.h>;
+ many older Unixes require this.
+ * lib/alloca.c (alloca): Remove cast to argument of free;
+ no longer needed in C89.
+ * lib/alloca_.h, lib/regex.h: Fix white space to match
+ what GNU indent does.
+
2003-08-05 Paul Eggert <address@hidden>
* bumpalloc.h: Remove.
Index: lib/acl.c
===================================================================
RCS file: /cvsroot/gnulib/gnulib/lib/acl.c,v
retrieving revision 1.1
diff -p -u -r1.1 acl.c
--- lib/acl.c 26 Feb 2002 15:38:49 -0000 1.1
+++ lib/acl.c 9 Aug 2003 08:56:38 -0000
@@ -1,6 +1,6 @@
/* acl.c - access control lists
- Copyright (C) 2002 Free Software Foundation, Inc.
+ Copyright (C) 2002, 2003 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
@@ -22,6 +22,7 @@
# include <config.h>
#endif
+#include <sys/types.h>
#include <sys/stat.h>
#ifndef S_ISLNK
# define S_ISLNK(Mode) 0
Index: lib/alloca.c
===================================================================
RCS file: /cvsroot/gnulib/gnulib/lib/alloca.c,v
retrieving revision 1.9
diff -p -u -r1.9 alloca.c
--- lib/alloca.c 5 Dec 2002 20:46:03 -0000 1.9
+++ lib/alloca.c 9 Aug 2003 08:56:38 -0000
@@ -193,7 +193,7 @@ alloca (size)
{
register header *np = hp->h.next;
- free ((pointer) hp); /* Collect garbage. */
+ free (hp); /* Collect garbage. */
hp = np; /* -> next header. */
}
Index: lib/alloca_.h
===================================================================
RCS file: /cvsroot/gnulib/gnulib/lib/alloca_.h,v
retrieving revision 1.3
diff -p -u -r1.3 alloca_.h
--- lib/alloca_.h 9 Jul 2003 22:48:52 -0000 1.3
+++ lib/alloca_.h 9 Aug 2003 08:56:38 -0000
@@ -21,7 +21,7 @@
"config.h", not later. */
#ifndef _ALLOCA_H
-#define _ALLOCA_H
+# define _ALLOCA_H
/* alloca(N) returns a pointer (void* or char*) to N bytes of memory
allocated on the stack, and which will last until the function returns.
@@ -34,35 +34,35 @@
request, the program just crashes.
*/
-#ifdef __GNUC__
-# ifndef alloca
-# define alloca __builtin_alloca
-# endif
-#else
-# ifdef _MSC_VER
-# include <malloc.h>
-# define alloca _alloca
+# ifdef __GNUC__
+# ifndef alloca
+# define alloca __builtin_alloca
+# endif
# else
-# if HAVE_ALLOCA_H
-# include <alloca.h>
+# ifdef _MSC_VER
+# include <malloc.h>
+# define alloca _alloca
# else
-# ifdef _AIX
- #pragma alloca
+# if HAVE_ALLOCA_H
+# include <alloca.h>
# else
-# ifdef __hpux /* This section must match that of bison generated files. */
-# ifdef __cplusplus
+# ifdef _AIX
+ # pragma alloca
+# else
+# ifdef __hpux /* This section must match that of bison generated files. */
+# ifdef __cplusplus
extern "C" void *alloca (unsigned int);
-# else /* not __cplusplus */
+# else /* not __cplusplus */
extern void *alloca ();
-# endif /* not __cplusplus */
-# else /* not __hpux */
-# ifndef alloca
+# endif /* not __cplusplus */
+# else /* not __hpux */
+# ifndef alloca
extern char *alloca ();
-# endif
-# endif /* __hpux */
+# endif
+# endif /* __hpux */
+# endif
# endif
# endif
# endif
-#endif
#endif /* _ALLOCA_H */
Index: lib/regex.h
===================================================================
RCS file: /cvsroot/gnulib/gnulib/lib/regex.h,v
retrieving revision 1.17
diff -p -u -r1.17 regex.h
--- lib/regex.h 18 Apr 2003 12:04:31 -0000 1.17
+++ lib/regex.h 9 Aug 2003 08:56:39 -0000
@@ -193,7 +193,7 @@ extern reg_syntax_t re_syntax_options;
& ~(RE_DOT_NOT_NULL | RE_INTERVALS | RE_CONTEXT_INDEP_OPS \
| RE_CONTEXT_INVALID_OPS ))
-#define RE_SYNTAX_POSIX_AWK \
+#define RE_SYNTAX_POSIX_AWK \
(RE_SYNTAX_POSIX_EXTENDED | RE_BACKSLASH_ESCAPE_IN_LISTS \
| RE_INTERVALS | RE_NO_GNU_OPS)
- [Bug-gnulib] merge of acl.c, alloca.c, alloca_.h, regex.c from coreutils,
Paul Eggert <=
- Re: [Bug-gnulib] merge of acl.c, alloca.c, alloca_.h, regex.c from coreutils, Bruno Haible, 2003/08/11
- Re: [Bug-gnulib] merge of acl.c, alloca.c, alloca_.h, regex.c from coreutils, Jim Meyering, 2003/08/11
- Re: [Bug-gnulib] merge of acl.c, alloca.c, alloca_.h, regex.c from coreutils, Bruno Haible, 2003/08/11
- Re: [Bug-gnulib] merge of acl.c, alloca.c, alloca_.h, regex.c from coreutils, Paul Eggert, 2003/08/11
- Re: [Bug-gnulib] merge of acl.c, alloca.c, alloca_.h, regex.c from coreutils, Jim Meyering, 2003/08/11
- Re: [Bug-gnulib] merge of acl.c, alloca.c, alloca_.h, regex.c from coreutils, Paul Eggert, 2003/08/12
- Re: [Bug-gnulib] merge of acl.c, alloca.c, alloca_.h, regex.c from coreutils, Jim Meyering, 2003/08/11