Skip to content

Commit 97cf1fa

Browse files
committed
Assume that we have <wchar.h>.
Windows has this, and so do all other live platforms according to the buildfarm; it's been required by POSIX since SUSv2. So remove the configure probe and tests of HAVE_WCHAR_H. This is part of a series of commits to get rid of no-longer-relevant configure checks and dead src/port/ code. I'm committing them separately to make it easier to back out individual changes if they prove less portable than I expect. Discussion: https://postgr.es/m/15379.1582221614@sss.pgh.pa.us
1 parent 481c8e9 commit 97cf1fa

File tree

7 files changed

+4
-15
lines changed

7 files changed

+4
-15
lines changed

configure

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12762,7 +12762,7 @@ $as_echo "#define HAVE_STDBOOL_H 1" >>confdefs.h
1276212762
fi
1276312763

1276412764

12765-
for ac_header in atomic.h copyfile.h execinfo.h getopt.h ifaddrs.h langinfo.h mbarrier.h poll.h sys/epoll.h sys/event.h sys/ipc.h sys/prctl.h sys/procctl.h sys/pstat.h sys/resource.h sys/select.h sys/sem.h sys/shm.h sys/sockio.h sys/tas.h sys/un.h termios.h ucred.h wchar.h wctype.h
12765+
for ac_header in atomic.h copyfile.h execinfo.h getopt.h ifaddrs.h langinfo.h mbarrier.h poll.h sys/epoll.h sys/event.h sys/ipc.h sys/prctl.h sys/procctl.h sys/pstat.h sys/resource.h sys/select.h sys/sem.h sys/shm.h sys/sockio.h sys/tas.h sys/un.h termios.h ucred.h wctype.h
1276612766
do :
1276712767
as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
1276812768
ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"

configure.in

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1300,7 +1300,6 @@ AC_CHECK_HEADERS(m4_normalize([
13001300
sys/un.h
13011301
termios.h
13021302
ucred.h
1303-
wchar.h
13041303
wctype.h
13051304
]))
13061305

src/backend/utils/adt/formatting.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -72,11 +72,9 @@
7272

7373
/*
7474
* towlower() and friends should be in <wctype.h>, but some pre-C99 systems
75-
* declare them in <wchar.h>.
75+
* declare them in <wchar.h>, so include that too.
7676
*/
77-
#ifdef HAVE_WCHAR_H
7877
#include <wchar.h>
79-
#endif
8078
#ifdef HAVE_WCTYPE_H
8179
#include <wctype.h>
8280
#endif

src/include/pg_config.h.in

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -677,9 +677,6 @@
677677
/* Define to 1 if you have the <uuid/uuid.h> header file. */
678678
#undef HAVE_UUID_UUID_H
679679

680-
/* Define to 1 if you have the <wchar.h> header file. */
681-
#undef HAVE_WCHAR_H
682-
683680
/* Define to 1 if you have the `wcstombs_l' function. */
684681
#undef HAVE_WCSTOMBS_L
685682

src/include/regex/regcustom.h

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,11 +43,9 @@
4343

4444
/*
4545
* towlower() and friends should be in <wctype.h>, but some pre-C99 systems
46-
* declare them in <wchar.h>.
46+
* declare them in <wchar.h>, so include that too.
4747
*/
48-
#ifdef HAVE_WCHAR_H
4948
#include <wchar.h>
50-
#endif
5149
#ifdef HAVE_WCTYPE_H
5250
#include <wctype.h>
5351
#endif

src/include/tsearch/ts_locale.h

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,9 @@
2020

2121
/*
2222
* towlower() and friends should be in <wctype.h>, but some pre-C99 systems
23-
* declare them in <wchar.h>.
23+
* declare them in <wchar.h>, so include that too.
2424
*/
25-
#ifdef HAVE_WCHAR_H
2625
#include <wchar.h>
27-
#endif
2826
#ifdef HAVE_WCTYPE_H
2927
#include <wctype.h>
3028
#endif

src/tools/msvc/Solution.pm

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -396,7 +396,6 @@ sub GenerateFiles
396396
HAVE_UUID_H => undef,
397397
HAVE_UUID_UUID_H => undef,
398398
HAVE_WINLDAP_H => undef,
399-
HAVE_WCHAR_H => 1,
400399
HAVE_WCSTOMBS_L => 1,
401400
HAVE_WCTYPE_H => 1,
402401
HAVE_X509_GET_SIGNATURE_NID => 1,

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy