diff options
| author | joseph <joseph@7b3dc134-2b1b-0410-93df-9e9f96275f8d> | 2009-10-30 17:58:03 +0000 |
|---|---|---|
| committer | joseph <joseph@7b3dc134-2b1b-0410-93df-9e9f96275f8d> | 2009-10-30 17:58:03 +0000 |
| commit | bcc37abc0abd384886ad532b3e13c3c9579da0c1 (patch) | |
| tree | e67f114b1e2098264a6737bdb79cfaa248b4e0b2 /libc/include | |
| parent | 7bda88f34e2e6e190fe3d0ab32750f8a2cb89a2d (diff) | |
Merge changes between r9152 and r9169 from /fsf/trunk.
git-svn-id: svn://svn.eglibc.org/trunk@9170 7b3dc134-2b1b-0410-93df-9e9f96275f8d
Diffstat (limited to 'libc/include')
| -rw-r--r-- | libc/include/features.h | 2 | ||||
| -rw-r--r-- | libc/include/stdio.h | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/libc/include/features.h b/libc/include/features.h index 9d1fd9093..273283559 100644 --- a/libc/include/features.h +++ b/libc/include/features.h @@ -327,7 +327,7 @@ /* Major and minor version number of the GNU C library package. Use these macros to test for features in specific releases. */ #define __GLIBC__ 2 -#define __GLIBC_MINOR__ 10 +#define __GLIBC_MINOR__ 11 #define __GLIBC_PREREQ(maj, min) \ ((__GLIBC__ << 16) + __GLIBC_MINOR__ >= ((maj) << 16) + (min)) diff --git a/libc/include/stdio.h b/libc/include/stdio.h index 444aa3900..6b053b8ae 100644 --- a/libc/include/stdio.h +++ b/libc/include/stdio.h @@ -80,7 +80,8 @@ extern int __path_search (char *__tmpl, size_t __tmpl_len, __const char *__dir, __const char *__pfx, int __try_tempdir); -extern int __gen_tempname (char *__tmpl, int __flags, int __kind); +extern int __gen_tempname (char *__tmpl, int __suffixlen, int __flags, + int __kind); /* The __kind argument to __gen_tempname may be one of: */ # define __GT_FILE 0 /* create a file */ # define __GT_DIR 1 /* create a directory */ |