Skip to content

Commit bc900e4

Browse files
committed
Add Configure probe for querylocale()
As requested by khw++ Until the relevant symbol is used, HAS_QUERYLOCALE must be mentioned explicitly in metaconfig.h. This corresponds to metaconfig 541f0dd272df4f9326996727898393ac8f6626f7.
1 parent bd4dc88 commit bc900e4

File tree

15 files changed

+33
-5
lines changed

15 files changed

+33
-5
lines changed

Configure

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -681,6 +681,7 @@ d_nearbyint=''
681681
d_duplocale=''
682682
d_freelocale=''
683683
d_newlocale=''
684+
d_querylocale=''
684685
d_uselocale=''
685686
i_xlocale=''
686687
d_nextafter=''
@@ -14149,6 +14150,10 @@ eval $inlibc
1414914150
set duplocale d_duplocale
1415014151
eval $inlibc
1415114152

14153+
: see if querylocale exists
14154+
set querylocale d_querylocale
14155+
eval $inlibc
14156+
1415214157
: see if frexpl exists
1415314158
set frexpl d_frexpl
1415414159
eval $inlibc
@@ -24518,6 +24523,7 @@ d_pwpasswd='$d_pwpasswd'
2451824523
d_pwquota='$d_pwquota'
2451924524
d_qgcvt='$d_qgcvt'
2452024525
d_quad='$d_quad'
24526+
d_querylocale='$d_querylocale'
2452124527
d_random_r='$d_random_r'
2452224528
d_re_comp='$d_re_comp'
2452324529
d_readdir64_r='$d_readdir64_r'

Cross/config.sh-arm-linux

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -432,6 +432,7 @@ d_pwpasswd='define'
432432
d_pwquota='undef'
433433
d_qgcvt='define'
434434
d_quad='define'
435+
d_querylocale='undef'
435436
d_random_r='undef'
436437
d_readdir64_r='undef'
437438
d_readdir='define'

NetWare/config.wc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -421,6 +421,7 @@ d_pwpasswd='undef'
421421
d_pwquota='undef'
422422
d_qgcvt='undef'
423423
d_quad='undef'
424+
d_querylocale='undef'
424425
d_random_r='undef'
425426
d_readdir64_r='undef'
426427
d_readdir='define'

Porting/config.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -442,6 +442,7 @@ d_pwpasswd='define'
442442
d_pwquota='undef'
443443
d_qgcvt='undef'
444444
d_quad='define'
445+
d_querylocale='undef'
445446
d_random_r='undef'
446447
d_re_comp='undef'
447448
d_readdir64_r='undef'

config_h.SH

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3246,9 +3246,14 @@ sed <<!GROK!THIS! >$CONFIG_H -e 's!^#undef\(.*/\)\*!/\*#define\1 \*!' -e 's!^#un
32463246
* This symbol, if defined, indicates that the uselocale routine is
32473247
* available to set the current locale for the calling thread.
32483248
*/
3249+
/* HAS_QUERYLOCALE:
3250+
* This symbol, if defined, indicates that the querylocale routine is
3251+
* available to return the name of the locale for a category mask.
3252+
*/
32493253
#$d_newlocale HAS_NEWLOCALE /**/
32503254
#$d_freelocale HAS_FREELOCALE /**/
32513255
#$d_uselocale HAS_USELOCALE /**/
3256+
#$d_querylocale HAS_QUERYLOCALE /**/
32523257
32533258
/* HAS_NEXTAFTER:
32543259
* This symbol, if defined, indicates that the nextafter routine is

configure.com

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6893,6 +6893,7 @@ $ WC "d_lgamma_r='undef'"
68936893
$ WC "d_localtime_r='undef'" ! leave undef'd; we use my_localtime
68946894
$ WC "d_localtime_r_needs_tzset='undef'"
68956895
$ WC "d_newlocale='undef'"
6896+
$ WC "d_querylocale='undef'"
68966897
$ WC "d_random_r='undef'"
68976898
$ WC "d_readdir_r='define'" ! always defined; we roll our own
68986899
$ WC "d_readdir64_r='undef'"

metaconfig.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131
* HAS_NEWLOCALE
3232
* HAS_PRCTL
3333
* HAS_PSEUDOFORK
34+
* HAS_QUERYLOCALE
3435
* HAS_TIMEGM
3536
* HAS_USELOCALE
3637
* I16SIZE

plan9/config_sh.sample

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -432,6 +432,7 @@ d_pwpasswd='undef'
432432
d_pwquota='undef'
433433
d_qgcvt='undef'
434434
d_quad='define'
435+
d_querylocale='undef'
435436
d_random_r='undef'
436437
d_readdir64_r='undef'
437438
d_readdir='define'

symbian/config.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -378,6 +378,7 @@ d_pwpasswd='undef'
378378
d_pwquota='undef'
379379
d_qgcvt='undef'
380380
d_quad='undef'
381+
d_querylocale='undef'
381382
d_random_r='undef'
382383
d_readdir64_r='undef'
383384
d_readdir='define'

uconfig.h

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@
182182
/*#define HAS_GETLOGIN / **/
183183

184184
/* HAS_GETPGID:
185-
* This symbol, if defined, indicates to the C program that
185+
* This symbol, if defined, indicates to the C program that
186186
* the getpgid(pid) function is available to get the
187187
* process group id.
188188
*/
@@ -641,8 +641,8 @@
641641
* This symbol holds the type used for the second argument to
642642
* getgroups() and setgroups(). Usually, this is the same as
643643
* gidtype (gid_t) , but sometimes it isn't.
644-
* It can be int, ushort, gid_t, etc...
645-
* It may be necessary to include <sys/types.h> to get any
644+
* It can be int, ushort, gid_t, etc...
645+
* It may be necessary to include <sys/types.h> to get any
646646
* typedef'ed information. This is only required if you have
647647
* getgroups() or setgroups()..
648648
*/
@@ -3211,9 +3211,14 @@
32113211
* This symbol, if defined, indicates that the uselocale routine is
32123212
* available to set the current locale for the calling thread.
32133213
*/
3214+
/* HAS_QUERYLOCALE:
3215+
* This symbol, if defined, indicates that the querylocale routine is
3216+
* available to return the name of the locale for a category mask.
3217+
*/
32143218
/*#define HAS_NEWLOCALE / **/
32153219
/*#define HAS_FREELOCALE / **/
32163220
/*#define HAS_USELOCALE / **/
3221+
/*#define HAS_QUERYLOCALE / **/
32173222

32183223
/* HAS_NEXTAFTER:
32193224
* This symbol, if defined, indicates that the nextafter routine is
@@ -5241,6 +5246,6 @@
52415246
#endif
52425247

52435248
/* Generated from:
5244-
* ce61c4f18e82f6356cdae44c5336ceac1d3253033d7449651927f5633be5c3c2 config_h.SH
5245-
* f28cf0c2509cffce1f29866cccd109cee84c941fc63685f0795d25380d47382d uconfig.sh
5249+
* ad669f127235e5deedd1f98bea3dbe5c0b7c3b18ebbe8f0d91f3496f18af832c config_h.SH
5250+
* fb9ab8a0e51b906cd21cc8e6fc3a50303358996b27814b31f94850c4777e65d7 uconfig.sh
52465251
* ex: set ro: */

uconfig.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -371,6 +371,7 @@ d_pwpasswd='undef'
371371
d_pwquota='undef'
372372
d_qgcvt='undef'
373373
d_quad='undef'
374+
d_querylocale='undef'
374375
d_random_r='undef'
375376
d_readdir64_r='undef'
376377
d_readdir='define'

uconfig64.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -372,6 +372,7 @@ d_pwpasswd='undef'
372372
d_pwquota='undef'
373373
d_qgcvt='undef'
374374
d_quad='define'
375+
d_querylocale='undef'
375376
d_random_r='undef'
376377
d_readdir64_r='undef'
377378
d_readdir='define'

win32/config.ce

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -419,6 +419,7 @@ d_pwpasswd='undef'
419419
d_pwquota='undef'
420420
d_qgcvt='undef'
421421
d_quad='undef'
422+
d_querylocale='undef'
422423
d_random_r='undef'
423424
d_readdir64_r='undef'
424425
d_readdir='define'

win32/config.gc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -420,6 +420,7 @@ d_pwpasswd='undef'
420420
d_pwquota='undef'
421421
d_qgcvt='undef'
422422
d_quad='define'
423+
d_querylocale='undef'
423424
d_random_r='undef'
424425
d_readdir64_r='undef'
425426
d_readdir='define'

win32/config.vc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -420,6 +420,7 @@ d_pwpasswd='undef'
420420
d_pwquota='undef'
421421
d_qgcvt='undef'
422422
d_quad='define'
423+
d_querylocale='undef'
423424
d_random_r='undef'
424425
d_readdir64_r='undef'
425426
d_readdir='define'

0 commit comments

Comments
 (0)