Skip to content

Commit 07aa900

Browse files
bhaiblebhaible
committed
Update from gnulib.
1 parent 678afa4 commit 07aa900

File tree

6 files changed

+50
-26
lines changed

6 files changed

+50
-26
lines changed

‎.gitignore‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
/libcharset/m4/glibc21.m4
2525
/libcharset/m4/relocatable-lib.m4
2626
/libcharset/m4/visibility.m4
27+
/srclib/_Noreturn.h
2728
/srclib/Makefile.gnulib
2829
/srclib/alloca.in.h
2930
/srclib/allocator.c
@@ -45,6 +46,7 @@
4546
/srclib/error.c
4647
/srclib/error.h
4748
/srclib/fcntl.in.h
49+
/srclib/filename.h
4850
/srclib/getprogname.c
4951
/srclib/getprogname.h
5052
/srclib/gettext.h
@@ -77,6 +79,10 @@
7779
/srclib/signal.in.h
7880
/srclib/sigprocmask.c
7981
/srclib/stat.c
82+
/srclib/stat-time.c
83+
/srclib/stat-time.h
84+
/srclib/stat-w32.c
85+
/srclib/stat-w32.h
8086
/srclib/stdbool.in.h
8187
/srclib/stddef.in.h
8288
/srclib/stdint.in.h
@@ -125,12 +131,12 @@
125131
/srcm4/fcntl_h.m4
126132
/srcm4/getprogname.m4
127133
/srcm4/gettext.m4
128-
/srcm4/gettimeofday.m4
129134
/srcm4/glibc2.m4
130135
/srcm4/glibc21.m4
131136
/srcm4/gnulib-common.m4
132137
/srcm4/gnulib-comp.m4
133138
/srcm4/gnulib-tool.m4
139+
/srcm4/host-cpu-c-abi.m4
134140
/srcm4/iconv.m4
135141
/srcm4/include_next.m4
136142
/srcm4/intdiv0.m4
@@ -175,6 +181,7 @@
175181
/srcm4/sigpipe.m4
176182
/srcm4/size_max.m4
177183
/srcm4/ssize_t.m4
184+
/srcm4/stat-time.m4
178185
/srcm4/stat.m4
179186
/srcm4/stdbool.m4
180187
/srcm4/stddef_h.m4
@@ -186,7 +193,6 @@
186193
/srcm4/string_h.m4
187194
/srcm4/sys_socket_h.m4
188195
/srcm4/sys_stat_h.m4
189-
/srcm4/sys_time_h.m4
190196
/srcm4/sys_types_h.m4
191197
/srcm4/threadlib.m4
192198
/srcm4/time_h.m4

‎ChangeLog‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
2018-05-04 Bruno Haible <bruno@clisp.org>
2+
3+
* lib/relocatable.c: Update from gnulib.
4+
15
2018-05-04 Bruno Haible <bruno@clisp.org>
26

37
Switch to automake 1.16.

‎lib/relocatable.c‎

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/* Provide relocatable packages.
2-
Copyright (C) 2003-2006, 2008-2017 Free Software Foundation, Inc.
2+
Copyright (C) 2003-2006, 2008-2018 Free Software Foundation, Inc.
33
Written by Bruno Haible <bruno@clisp.org>, 2003.
44
55
This program is free software; you can redistribute it and/or modify it
@@ -42,7 +42,7 @@
4242
# include "xalloc.h"
4343
#endif
4444

45-
#if (defined _WIN32 || defined __WIN32__) && !defined __CYGWIN__
45+
#if defined _WIN32 && !defined __CYGWIN__
4646
# define WIN32_LEAN_AND_MEAN
4747
# include <windows.h>
4848
#endif
@@ -77,7 +77,7 @@
7777
ISSLASH(C) tests whether C is a directory separator character.
7878
IS_PATH_WITH_DIR(P) tests whether P contains a directory specification.
7979
*/
80-
#if ((defined _WIN32 || defined __WIN32__) && !defined __CYGWIN__) || defined __EMX__ || defined __DJGPP__
80+
#if (defined _WIN32 && !defined __CYGWIN__) || defined __EMX__ || defined __DJGPP__
8181
/* Native Windows, OS/2, DOS */
8282
# define ISSLASH(C) ((C) == '/' || (C) == '\\')
8383
# define HAS_DEVICE(P) \
@@ -99,7 +99,7 @@
9999
platforms, see below. Therefore we enable it by default only on native
100100
Windows platforms. */
101101
#ifndef ENABLE_COSTLY_RELOCATABLE
102-
# if (defined _WIN32 || defined __WIN32__) && !defined __CYGWIN__
102+
# if defined _WIN32 && !defined __CYGWIN__
103103
# define ENABLE_COSTLY_RELOCATABLE 1
104104
# else
105105
# define ENABLE_COSTLY_RELOCATABLE 0
@@ -256,7 +256,7 @@ compute_curr_prefix (const char *orig_installprefix,
256256
/* Do case-insensitive comparison if the file system is always or
257257
often case-insensitive. It's better to accept the comparison
258258
if the difference is only in case, rather than to fail. */
259-
#if defined _WIN32 || defined __WIN32__ || defined __CYGWIN__ || defined __EMX__ || defined __DJGPP__
259+
#if defined _WIN32 || defined __CYGWIN__ || defined __EMX__ || defined __DJGPP__
260260
/* Native Windows, Cygwin, OS/2, DOS - case insignificant file system */
261261
if ((*rpi >= 'a' && *rpi <= 'z' ? *rpi - 'a' + 'A' : *rpi)
262262
!= (*cpi >= 'a' && *cpi <= 'z' ? *cpi - 'a' + 'A' : *cpi))
@@ -310,12 +310,12 @@ compute_curr_prefix (const char *orig_installprefix,
310310
/* Full pathname of shared library, or NULL. */
311311
static char *shared_library_fullname;
312312

313-
#if (defined _WIN32 || defined __WIN32__) && !defined __CYGWIN__
313+
#if defined _WIN32 && !defined __CYGWIN__
314314
/* Native Windows only.
315315
On Cygwin, it is better to use the Cygwin provided /proc interface, than
316316
to use native Windows API and cygwin_conv_to_posix_path, because it
317317
supports longer file names
318-
(see <http://cygwin.com/ml/cygwin/2011-01/msg00410.html>). */
318+
(see <https://cygwin.com/ml/cygwin/2011-01/msg00410.html>). */
319319

320320
/* Determine the full pathname of the shared library when it is loaded. */
321321

@@ -445,8 +445,7 @@ find_shared_library_fullname ()
445445
static char *
446446
get_shared_library_fullname ()
447447
{
448-
#if (!((defined _WIN32 || defined __WIN32__) && !defined __CYGWIN__) \
449-
&& !defined __EMX__)
448+
#if !(defined _WIN32 && !defined __CYGWIN__) && !defined __EMX__
450449
static bool tried_find_shared_library_fullname;
451450
if (!tried_find_shared_library_fullname)
452451
{

‎libcharset/lib/ChangeLog‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,17 @@
1+
2018-05-04 Bruno Haible <bruno@clisp.org>
2+
3+
* localcharset.c: Update from gnulib.
4+
2018-05-03 Bruno Haible <bruno@clisp.org>
5+
* localcharset.c: Simplify 'defined _WIN32 || defined __WIN32__'
6+
to just 'defined _WIN32'.
7+
2018-04-21 Benno Schulenberg <bensberg@telfort.nl> (tiny change)
8+
* localcharset.c (get_charset_aliases): Add a tautological
9+
UTF-8 entry to speed up the search for this case.
10+
2017-09-14 Bruno Haible <bruno@clisp.org>
11+
all: Replace many more http URLs by https URLs.
12+
13+
* relocatable.c: Update from gnulib.
14+
115
2017-05-18 Bruno Haible <bruno@clisp.org>
216

317
* localcharset.c: Update from gnulib.

‎libcharset/lib/localcharset.c‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/* Determine a canonical name for the current locale's character encoding.
22
3-
Copyright (C) 2000-2006, 2008-2017 Free Software Foundation, Inc.
3+
Copyright (C) 2000-2006, 2008-2018 Free Software Foundation, Inc.
44
55
This program is free software; you can redistribute it and/or modify it
66
under the terms of the GNU Library General Public License as published
@@ -32,7 +32,7 @@
3232
# define DARWIN7 /* Darwin 7 or newer, i.e. Mac OS X 10.3 or newer */
3333
#endif
3434

35-
#if (defined _WIN32 || defined __WIN32__) && !defined __CYGWIN__
35+
#if defined _WIN32 && !defined __CYGWIN__
3636
# define WINDOWS_NATIVE
3737
# include <locale.h>
3838
#endif
@@ -88,7 +88,7 @@
8888
# define O_NOFOLLOW 0
8989
#endif
9090

91-
#if defined _WIN32 || defined __WIN32__ || defined __CYGWIN__ || defined __EMX__ || defined __DJGPP__
91+
#if defined _WIN32 || defined __CYGWIN__ || defined __EMX__ || defined __DJGPP__
9292
/* Native Windows, Cygwin, OS/2, DOS */
9393
# define ISSLASH(C) ((C) == '/' || (C) == '\\')
9494
#endif
@@ -262,8 +262,10 @@ get_charset_aliases (void)
262262
# if defined DARWIN7
263263
/* To avoid the trouble of installing a file that is shared by many
264264
GNU packages -- many packaging systems have problems with this --,
265-
simply inline the aliases here. */
266-
cp = "ISO8859-1" "\0" "ISO-8859-1" "\0"
265+
simply inline the aliases here.
266+
For speed, map the most frequent case first. */
267+
cp = "UTF-8" "\0" "UTF-8" "\0"
268+
"ISO8859-1" "\0" "ISO-8859-1" "\0"
267269
"ISO8859-2" "\0" "ISO-8859-2" "\0"
268270
"ISO8859-4" "\0" "ISO-8859-4" "\0"
269271
"ISO8859-5" "\0" "ISO-8859-5" "\0"
@@ -355,7 +357,7 @@ get_charset_aliases (void)
355357
by Alex Taylor:
356358
<http://altsan.org/os2/toolkits/uls/index.html#codepages>.
357359
See also "IBM Globalization - Code page identifiers":
358-
<http://www-01.ibm.com/software/globalization/cp/cp_cpgid.html>. */
360+
<https://www-01.ibm.com/software/globalization/cp/cp_cpgid.html>. */
359361
cp = "CP813" "\0" "ISO-8859-7" "\0"
360362
"CP878" "\0" "KOI8-R" "\0"
361363
"CP819" "\0" "ISO-8859-1" "\0"

‎libcharset/lib/relocatable.c‎

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/* Provide relocatable packages.
2-
Copyright (C) 2003-2006, 2008-2017 Free Software Foundation, Inc.
2+
Copyright (C) 2003-2006, 2008-2018 Free Software Foundation, Inc.
33
Written by Bruno Haible <bruno@clisp.org>, 2003.
44
55
This program is free software; you can redistribute it and/or modify it
@@ -42,7 +42,7 @@
4242
# include "xalloc.h"
4343
#endif
4444

45-
#if (defined _WIN32 || defined __WIN32__) && !defined __CYGWIN__
45+
#if defined _WIN32 && !defined __CYGWIN__
4646
# define WIN32_LEAN_AND_MEAN
4747
# include <windows.h>
4848
#endif
@@ -77,7 +77,7 @@
7777
ISSLASH(C) tests whether C is a directory separator character.
7878
IS_PATH_WITH_DIR(P) tests whether P contains a directory specification.
7979
*/
80-
#if ((defined _WIN32 || defined __WIN32__) && !defined __CYGWIN__) || defined __EMX__ || defined __DJGPP__
80+
#if (defined _WIN32 && !defined __CYGWIN__) || defined __EMX__ || defined __DJGPP__
8181
/* Native Windows, OS/2, DOS */
8282
# define ISSLASH(C) ((C) == '/' || (C) == '\\')
8383
# define HAS_DEVICE(P) \
@@ -99,7 +99,7 @@
9999
platforms, see below. Therefore we enable it by default only on native
100100
Windows platforms. */
101101
#ifndef ENABLE_COSTLY_RELOCATABLE
102-
# if (defined _WIN32 || defined __WIN32__) && !defined __CYGWIN__
102+
# if defined _WIN32 && !defined __CYGWIN__
103103
# define ENABLE_COSTLY_RELOCATABLE 1
104104
# else
105105
# define ENABLE_COSTLY_RELOCATABLE 0
@@ -256,7 +256,7 @@ compute_curr_prefix (const char *orig_installprefix,
256256
/* Do case-insensitive comparison if the file system is always or
257257
often case-insensitive. It's better to accept the comparison
258258
if the difference is only in case, rather than to fail. */
259-
#if defined _WIN32 || defined __WIN32__ || defined __CYGWIN__ || defined __EMX__ || defined __DJGPP__
259+
#if defined _WIN32 || defined __CYGWIN__ || defined __EMX__ || defined __DJGPP__
260260
/* Native Windows, Cygwin, OS/2, DOS - case insignificant file system */
261261
if ((*rpi >= 'a' && *rpi <= 'z' ? *rpi - 'a' + 'A' : *rpi)
262262
!= (*cpi >= 'a' && *cpi <= 'z' ? *cpi - 'a' + 'A' : *cpi))
@@ -310,12 +310,12 @@ compute_curr_prefix (const char *orig_installprefix,
310310
/* Full pathname of shared library, or NULL. */
311311
static char *shared_library_fullname;
312312

313-
#if (defined _WIN32 || defined __WIN32__) && !defined __CYGWIN__
313+
#if defined _WIN32 && !defined __CYGWIN__
314314
/* Native Windows only.
315315
On Cygwin, it is better to use the Cygwin provided /proc interface, than
316316
to use native Windows API and cygwin_conv_to_posix_path, because it
317317
supports longer file names
318-
(see <http://cygwin.com/ml/cygwin/2011-01/msg00410.html>). */
318+
(see <https://cygwin.com/ml/cygwin/2011-01/msg00410.html>). */
319319

320320
/* Determine the full pathname of the shared library when it is loaded. */
321321

@@ -445,8 +445,7 @@ find_shared_library_fullname ()
445445
static char *
446446
get_shared_library_fullname ()
447447
{
448-
#if (!((defined _WIN32 || defined __WIN32__) && !defined __CYGWIN__) \
449-
&& !defined __EMX__)
448+
#if !(defined _WIN32 && !defined __CYGWIN__) && !defined __EMX__
450449
static bool tried_find_shared_library_fullname;
451450
if (!tried_find_shared_library_fullname)
452451
{

0 commit comments

Comments
 (0)