diff options
| author | joseph <joseph@7b3dc134-2b1b-0410-93df-9e9f96275f8d> | 2012-07-31 15:30:38 +0000 |
|---|---|---|
| committer | joseph <joseph@7b3dc134-2b1b-0410-93df-9e9f96275f8d> | 2012-07-31 15:30:38 +0000 |
| commit | dd3105b347f432016fcdc1abd472c3717f557c9e (patch) | |
| tree | cbaaecdaa1d3ad240177c9040f7f46c1387716ce /libc/conform | |
| parent | 20f73aac36c2b2c240dcc379d5117488fe44960c (diff) | |
| download | eglibc2-dd3105b347f432016fcdc1abd472c3717f557c9e.tar.gz | |
Merge changes between r19464 and r19920 from /fsf/trunk.
git-svn-id: svn://svn.eglibc.org/trunk@19921 7b3dc134-2b1b-0410-93df-9e9f96275f8d
Diffstat (limited to 'libc/conform')
| -rw-r--r-- | libc/conform/data/string.h-data | 11 | ||||
| -rw-r--r-- | libc/conform/data/time.h-data | 6 |
2 files changed, 11 insertions, 6 deletions
diff --git a/libc/conform/data/string.h-data b/libc/conform/data/string.h-data index 0403c2e32..365a5377a 100644 --- a/libc/conform/data/string.h-data +++ b/libc/conform/data/string.h-data @@ -1,4 +1,4 @@ -constant NULL +macro-constant NULL == 0 type size_t #if defined XOPEN2K8 || defined POSIX2008 @@ -61,8 +61,13 @@ function size_t strxfrm (char*, const char*, size_t) function size_t strxfrm_l (char*, const char*, size_t, locale_t) #endif +#if !defined ISO && !defined ISO99 && !defined ISO11 allow-header stddef.h +#endif -allow str* -allow wcs* +allow str[abcdefghijklmnopqrstuvwxyz]* +allow mem[abcdefghijklmnopqrstuvwxyz]* +allow wcs[abcdefghijklmnopqrstuvwxyz]* +#if !defined ISO && !defined ISO99 && !defined ISO11 allow *_t +#endif diff --git a/libc/conform/data/time.h-data b/libc/conform/data/time.h-data index 0deb6be13..8ed2b4a68 100644 --- a/libc/conform/data/time.h-data +++ b/libc/conform/data/time.h-data @@ -1,8 +1,8 @@ -constant NULL -constant CLOCKS_PER_SEC +macro-constant NULL == 0 +macro CLOCKS_PER_SEC {clock_t} #ifdef ISO11 -macro TIME_UTC +macro-int-constant TIME_UTC > 0 #endif #if !defined ISO && !defined ISO99 |