[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Cvs-cvs] ccvs ./ChangeLog ./configure lib/ChangeLog lib/...
|
From: |
Mark D. Baushke |
|
Subject: |
[Cvs-cvs] ccvs ./ChangeLog ./configure lib/ChangeLog lib/... |
|
Date: |
Thu, 30 Mar 2006 18:13:12 +0000 |
CVSROOT: /cvsroot/cvs
Module name: ccvs
Branch:
Changes by: Mark D. Baushke <address@hidden> 06/03/30 18:13:12
Modified files:
. : ChangeLog configure
lib : ChangeLog setenv.c stdint_.h time_r.c
unsetenv.c
m4 : ChangeLog regex.m4
windows-NT : ChangeLog stdint.h
Log message:
* configure: Regenerated.
* lib/setenv.c, lib/stdint_.h, lib/time_r.c, lib/unsetenv.c: Update from
GNULIB.
* m4/regex.m4: Update from GNULIB.
* windows-NT/stdint.h: Regenerated.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/ChangeLog.diff?tr1=1.1280&tr2=1.1281&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/configure.diff?tr1=1.434&tr2=1.435&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/lib/ChangeLog.diff?tr1=1.494&tr2=1.495&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/lib/setenv.c.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/lib/stdint_.h.diff?tr1=1.6&tr2=1.7&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/lib/time_r.c.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/lib/unsetenv.c.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/m4/ChangeLog.diff?tr1=1.158&tr2=1.159&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/m4/regex.m4.diff?tr1=1.8&tr2=1.9&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/windows-NT/ChangeLog.diff?tr1=1.349&tr2=1.350&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/windows-NT/stdint.h.diff?tr1=1.6&tr2=1.7&r1=text&r2=text
Patches:
Index: ccvs/ChangeLog
diff -u ccvs/ChangeLog:1.1280 ccvs/ChangeLog:1.1281
--- ccvs/ChangeLog:1.1280 Tue Mar 28 15:31:08 2006
+++ ccvs/ChangeLog Thu Mar 30 18:13:11 2006
@@ -1,3 +1,7 @@
+2006-03-30 Mark D. Baushke <address@hidden>
+
+ * configure: Regenerated.
+
2006-03-28 Derek Price <address@hidden>
[patch #4992]
Index: ccvs/configure
diff -u ccvs/configure:1.434 ccvs/configure:1.435
--- ccvs/configure:1.434 Mon Mar 20 02:21:55 2006
+++ ccvs/configure Thu Mar 30 18:13:11 2006
@@ -24990,7 +24990,7 @@
fi;
- case $with_included_regex in
+ case $with_included_regex in #(
yes|no) ac_use_included_regex=$with_included_regex
;;
'')
@@ -25001,11 +25001,11 @@
# test #75' in grep-2.3.
echo "$as_me:$LINENO: checking for working re_compile_pattern" >&5
echo $ECHO_N "checking for working re_compile_pattern... $ECHO_C" >&6
-if test "${gl_cv_func_re_compile_pattern_broken+set}" = set; then
+if test "${gl_cv_func_re_compile_pattern_working+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
if test "$cross_compiling" = yes; then
- gl_cv_func_re_compile_pattern_broken=yes
+ gl_cv_func_re_compile_pattern_working=no
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
@@ -25015,18 +25015,16 @@
/* end confdefs.h. */
$ac_includes_default
#include <regex.h>
+
int
main ()
{
static struct re_pattern_buffer regex;
const char *s;
struct re_registers regs;
- /* Use the POSIX-compliant spelling with leading REG_,
- rather than the traditional GNU spelling with leading RE_,
- so that we reject older libc implementations. */
- re_set_syntax (REG_SYNTAX_POSIX_EGREP);
+ re_set_syntax (RE_SYNTAX_POSIX_EGREP);
memset (®ex, 0, sizeof (regex));
- s = re_compile_pattern ("a[:]:]b\n", 9, ®ex);
+ s = re_compile_pattern ("a[[:]:]]b\n", 11, ®ex);
/* This should fail with _Invalid character class name_ error. */
if (!s)
exit (1);
@@ -25060,10 +25058,9 @@
exit (1);
/* The version of regex.c in older versions of gnulib
- ignored REG_IGNORE_CASE (which was then called RE_ICASE).
- Detect that problem too. */
+ ignored RE_ICASE. Detect that problem too. */
memset (®ex, 0, sizeof (regex));
- re_set_syntax (REG_SYNTAX_EMACS | REG_IGNORE_CASE);
+ re_set_syntax (RE_SYNTAX_EMACS | RE_ICASE);
s = re_compile_pattern ("x", 1, ®ex);
if (s)
exit (1);
@@ -25080,7 +25077,7 @@
These include glibc 2.3.5 on hosts with 64-bit ptrdiff_t
and 32-bit int. */
if (sizeof (regoff_t) < sizeof (ptrdiff_t)
- || sizeof (regoff_t) < sizeof (ssize_t))
+ || sizeof (regoff_t) < sizeof (ssize_t))
exit (1);
exit (0);
@@ -25099,21 +25096,24 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
- gl_cv_func_re_compile_pattern_broken=no
+ gl_cv_func_re_compile_pattern_working=yes
else
echo "$as_me: program exited with status $ac_status" >&5
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
( exit $ac_status )
-gl_cv_func_re_compile_pattern_broken=yes
+gl_cv_func_re_compile_pattern_working=no
fi
rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext
conftest.$ac_ext
fi
fi
-echo "$as_me:$LINENO: result: $gl_cv_func_re_compile_pattern_broken" >&5
-echo "${ECHO_T}$gl_cv_func_re_compile_pattern_broken" >&6
- ac_use_included_regex=$gl_cv_func_re_compile_pattern_broken
+echo "$as_me:$LINENO: result: $gl_cv_func_re_compile_pattern_working" >&5
+echo "${ECHO_T}$gl_cv_func_re_compile_pattern_working" >&6
+ case $gl_cv_func_re_compile_pattern_working in #(
+ yes) ac_use_included_regex=no;; #(
+ no) ac_use_included_regex=yes;;
+ esac
;;
*) { { echo "$as_me:$LINENO: error: Invalid value for --with-included-regex:
$with_included_regex" >&5
echo "$as_me: error: Invalid value for --with-included-regex:
$with_included_regex" >&2;}
Index: ccvs/lib/ChangeLog
diff -u ccvs/lib/ChangeLog:1.494 ccvs/lib/ChangeLog:1.495
--- ccvs/lib/ChangeLog:1.494 Tue Mar 28 20:41:42 2006
+++ ccvs/lib/ChangeLog Thu Mar 30 18:13:12 2006
@@ -1,3 +1,7 @@
+2006-03-30 Mark D. Baushke <address@hidden>
+
+ * setenv.c, stdint_.h, time_r.c, unsetenv.c: Update from GNULIB.
+
2006-03-26 Mark D. Baushke <address@hidden>
[bug #15040]
Index: ccvs/lib/setenv.c
diff -u ccvs/lib/setenv.c:1.4 ccvs/lib/setenv.c:1.5
--- ccvs/lib/setenv.c:1.4 Mon Mar 20 02:21:56 2006
+++ ccvs/lib/setenv.c Thu Mar 30 18:13:12 2006
@@ -13,9 +13,9 @@
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. */
+ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
-#if HAVE_CONFIG_H
+#ifdef HAVE_CONFIG_H
# include <config.h>
#endif
#include <alloca.h>
Index: ccvs/lib/stdint_.h
diff -u ccvs/lib/stdint_.h:1.6 ccvs/lib/stdint_.h:1.7
--- ccvs/lib/stdint_.h:1.6 Mon Mar 27 06:08:36 2006
+++ ccvs/lib/stdint_.h Thu Mar 30 18:13:12 2006
@@ -34,7 +34,14 @@
# include <sys/inttypes.h>
#endif
#if defined(__OpenBSD__)
+ /* In OpenBSD 3.8, <sys/types.h> includes <machine/types.h>, which defines
+ int{8,16,32,64}_t, uint{8,16,32,64}_t and __BIT_TYPES_DEFINED__.
+ <inttypes.h> includes <machine/types.h> and also defines intptr_t and
+ uintptr_t. */
# include <sys/types.h>
+# if HAVE_INTTYPES_H
+# include <inttypes.h>
+# endif
#endif
#if defined(__linux__) && HAVE_SYS_BITYPES_H
/* Linux libc4 >= 4.6.7 and libc5 have a <sys/bitypes.h> that defines
@@ -65,7 +72,7 @@
/* 7.18.1.1. Exact-width integer types */
-#if !defined(__FreeBSD__) && !defined(__OpenBSD__)
+#if !(defined(__FreeBSD__) || defined(__OpenBSD__))
#ifdef _STDINT_H_NEED_SIGNED_INT_TYPES
typedef signed char int8_t;
@@ -100,7 +107,7 @@
#define _STDINT_H_HAVE_INT64
#endif
-#endif /* !FreeBSD && !OpenBSD */
+#endif /* !(FreeBSD || OpenBSD) */
/* 7.18.1.2. Minimum-width integer types */
@@ -130,14 +137,14 @@
/* 7.18.1.4. Integer types capable of holding object pointers */
-#if !defined(__FreeBSD__) && !defined(__OpenBSD__)
+#if !(defined(__FreeBSD__) || (defined(__OpenBSD__) && HAVE_INTTYPES_H))
/* On some platforms (like IRIX6 MIPS with -n32) sizeof(void*) < sizeof(long),
but this doesn't matter here. */
typedef long intptr_t;
typedef unsigned long uintptr_t;
-#endif /* !FreeBSD && !OpenBSD */
+#endif /* !(FreeBSD || (OpenBSD && HAVE_INTTYPES_H)) */
/* 7.18.1.5. Greatest-width integer types */
Index: ccvs/lib/time_r.c
diff -u ccvs/lib/time_r.c:1.4 ccvs/lib/time_r.c:1.5
--- ccvs/lib/time_r.c:1.4 Mon Mar 20 02:21:56 2006
+++ ccvs/lib/time_r.c Thu Mar 30 18:13:12 2006
@@ -26,14 +26,6 @@
#include <string.h>
-static char *
-copy_string_result (char *dest, char const *src)
-{
- if (! src)
- return 0;
- return strcpy (dest, src);
-}
-
static struct tm *
copy_tm_result (struct tm *dest, struct tm const *src)
{
Index: ccvs/lib/unsetenv.c
diff -u ccvs/lib/unsetenv.c:1.3 ccvs/lib/unsetenv.c:1.4
--- ccvs/lib/unsetenv.c:1.3 Mon Mar 20 02:21:56 2006
+++ ccvs/lib/unsetenv.c Thu Mar 30 18:13:12 2006
@@ -13,9 +13,9 @@
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. */
+ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
-#if HAVE_CONFIG_H
+#ifdef HAVE_CONFIG_H
# include <config.h>
#endif
Index: ccvs/m4/ChangeLog
diff -u ccvs/m4/ChangeLog:1.158 ccvs/m4/ChangeLog:1.159
--- ccvs/m4/ChangeLog:1.158 Mon Mar 20 02:21:56 2006
+++ ccvs/m4/ChangeLog Thu Mar 30 18:13:12 2006
@@ -1,3 +1,7 @@
+2006-03-30 Mark D. Baushke <address@hidden>
+
+ * regex.m4: Update from GNULIB.
+
2006-03-19 Mark D. Baushke <address@hidden>
* clock_time.m4, extensions.m4, getaddrinfo.m4, gnulib-comp.m4,
Index: ccvs/m4/regex.m4
diff -u ccvs/m4/regex.m4:1.8 ccvs/m4/regex.m4:1.9
--- ccvs/m4/regex.m4:1.8 Mon Mar 20 02:21:56 2006
+++ ccvs/m4/regex.m4 Thu Mar 30 18:13:12 2006
@@ -1,4 +1,4 @@
-#serial 33
+#serial 35
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
# 2006 Free Software Foundation, Inc.
@@ -24,7 +24,7 @@
systems with recent-enough versions of the GNU C
Library (use with caution on other systems)])])
- case $with_included_regex in
+ case $with_included_regex in #(
yes|no) ac_use_included_regex=$with_included_regex
;;
'')
@@ -34,20 +34,18 @@
# regex.c. The first failing regular expression is from `Spencer ere
# test #75' in grep-2.3.
AC_CACHE_CHECK([for working re_compile_pattern],
- [gl_cv_func_re_compile_pattern_broken],
+ [gl_cv_func_re_compile_pattern_working],
[AC_RUN_IFELSE(
[AC_LANG_PROGRAM(
[AC_INCLUDES_DEFAULT
- #include <regex.h>],
+ #include <regex.h>
+ ],
[[static struct re_pattern_buffer regex;
const char *s;
struct re_registers regs;
- /* Use the POSIX-compliant spelling with leading REG_,
- rather than the traditional GNU spelling with leading RE_,
- so that we reject older libc implementations. */
- re_set_syntax (REG_SYNTAX_POSIX_EGREP);
+ re_set_syntax (RE_SYNTAX_POSIX_EGREP);
memset (®ex, 0, sizeof (regex));
- s = re_compile_pattern ("a[:@:>@:]b\n", 9, ®ex);
+ s = re_compile_pattern ("a[[:@:>@:]]b\n", 11, ®ex);
/* This should fail with _Invalid character class name_ error. */
if (!s)
exit (1);
@@ -81,10 +79,9 @@
exit (1);
/* The version of regex.c in older versions of gnulib
- ignored REG_IGNORE_CASE (which was then called RE_ICASE).
- Detect that problem too. */
+ ignored RE_ICASE. Detect that problem too. */
memset (®ex, 0, sizeof (regex));
- re_set_syntax (REG_SYNTAX_EMACS | REG_IGNORE_CASE);
+ re_set_syntax (RE_SYNTAX_EMACS | RE_ICASE);
s = re_compile_pattern ("x", 1, ®ex);
if (s)
exit (1);
@@ -101,15 +98,18 @@
These include glibc 2.3.5 on hosts with 64-bit ptrdiff_t
and 32-bit int. */
if (sizeof (regoff_t) < sizeof (ptrdiff_t)
- || sizeof (regoff_t) < sizeof (ssize_t))
+ || sizeof (regoff_t) < sizeof (ssize_t))
exit (1);
exit (0);]])],
- [gl_cv_func_re_compile_pattern_broken=no],
- [gl_cv_func_re_compile_pattern_broken=yes],
- dnl When crosscompiling, assume it is broken.
- [gl_cv_func_re_compile_pattern_broken=yes])])
- ac_use_included_regex=$gl_cv_func_re_compile_pattern_broken
+ [gl_cv_func_re_compile_pattern_working=yes],
+ [gl_cv_func_re_compile_pattern_working=no],
+ dnl When crosscompiling, assume it is not working.
+ [gl_cv_func_re_compile_pattern_working=no])])
+ case $gl_cv_func_re_compile_pattern_working in #(
+ yes) ac_use_included_regex=no;; #(
+ no) ac_use_included_regex=yes;;
+ esac
;;
*) AC_MSG_ERROR([Invalid value for --with-included-regex:
$with_included_regex])
;;
Index: ccvs/windows-NT/ChangeLog
diff -u ccvs/windows-NT/ChangeLog:1.349 ccvs/windows-NT/ChangeLog:1.350
--- ccvs/windows-NT/ChangeLog:1.349 Mon Mar 20 02:21:57 2006
+++ ccvs/windows-NT/ChangeLog Thu Mar 30 18:13:12 2006
@@ -1,3 +1,7 @@
+2006-03-30 Mark D. Baushke <address@hidden>
+
+ * stdint.h: Regenerated.
+
2006-03-19 Mark D. Baushke <address@hidden>
* Makefile.in, config.h, config.h.in, stamp-chi: Regenerated.
Index: ccvs/windows-NT/stdint.h
diff -u ccvs/windows-NT/stdint.h:1.6 ccvs/windows-NT/stdint.h:1.7
--- ccvs/windows-NT/stdint.h:1.6 Tue Mar 28 14:06:08 2006
+++ ccvs/windows-NT/stdint.h Thu Mar 30 18:13:12 2006
@@ -41,7 +41,14 @@
# include <sys/inttypes.h>
#endif
#if defined(__OpenBSD__)
+ /* In OpenBSD 3.8, <sys/types.h> includes <machine/types.h>, which defines
+ int{8,16,32,64}_t, uint{8,16,32,64}_t and __BIT_TYPES_DEFINED__.
+ <inttypes.h> includes <machine/types.h> and also defines intptr_t and
+ uintptr_t. */
# include <sys/types.h>
+# if HAVE_INTTYPES_H
+# include <inttypes.h>
+# endif
#endif
#if defined(__linux__) && HAVE_SYS_BITYPES_H
/* Linux libc4 >= 4.6.7 and libc5 have a <sys/bitypes.h> that defines
@@ -72,7 +79,7 @@
/* 7.18.1.1. Exact-width integer types */
-#if !defined(__FreeBSD__) && !defined(__OpenBSD__)
+#if !(defined(__FreeBSD__) || defined(__OpenBSD__))
#ifdef _STDINT_H_NEED_SIGNED_INT_TYPES
typedef signed char int8_t;
@@ -107,7 +114,7 @@
#define _STDINT_H_HAVE_INT64
#endif
-#endif /* !FreeBSD && !OpenBSD */
+#endif /* !(FreeBSD || OpenBSD) */
/* 7.18.1.2. Minimum-width integer types */
@@ -137,14 +144,14 @@
/* 7.18.1.4. Integer types capable of holding object pointers */
-#if !defined(__FreeBSD__) && !defined(__OpenBSD__)
+#if !(defined(__FreeBSD__) || (defined(__OpenBSD__) && HAVE_INTTYPES_H))
/* On some platforms (like IRIX6 MIPS with -n32) sizeof(void*) < sizeof(long),
but this doesn't matter here. */
typedef long intptr_t;
typedef unsigned long uintptr_t;
-#endif /* !FreeBSD && !OpenBSD */
+#endif /* !(FreeBSD || (OpenBSD && HAVE_INTTYPES_H)) */
/* 7.18.1.5. Greatest-width integer types */
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Cvs-cvs] ccvs ./ChangeLog ./configure lib/ChangeLog lib/...,
Mark D. Baushke <=