diff options
| author | joseph <joseph@7b3dc134-2b1b-0410-93df-9e9f96275f8d> | 2011-04-01 19:43:08 +0000 |
|---|---|---|
| committer | joseph <joseph@7b3dc134-2b1b-0410-93df-9e9f96275f8d> | 2011-04-01 19:43:08 +0000 |
| commit | c46d4a9b60ba79c321ab9075f71751389808a15a (patch) | |
| tree | 604d02100f0216b1684cfb7f51d46663b25b10d3 /libc/stdlib | |
| parent | 5c8cf8f50bb4598c4ecf2aa860aa7bf0ef0c3df7 (diff) | |
Merge changes between r13227 and r13354 from /fsf/trunk.
git-svn-id: svn://svn.eglibc.org/trunk@13355 7b3dc134-2b1b-0410-93df-9e9f96275f8d
Diffstat (limited to 'libc/stdlib')
| -rw-r--r-- | libc/stdlib/stdlib.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libc/stdlib/stdlib.h b/libc/stdlib/stdlib.h index d1f3841f1..f7d128c3d 100644 --- a/libc/stdlib/stdlib.h +++ b/libc/stdlib/stdlib.h @@ -1,4 +1,4 @@ -/* Copyright (C) 1991-2007, 2009, 2010 Free Software Foundation, Inc. +/* Copyright (C) 1991-2007, 2009, 2010, 2011 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -668,7 +668,7 @@ extern char *mkdtemp (char *__template) __THROW __nonnull ((1)) __wur; mkstemp. But allow the caller to pass additional flags which are used in the open call to create the file.. - This function is a possible cancellation points and therefore not + This function is a possible cancellation point and therefore not marked with __THROW. */ # ifndef __USE_FILE_OFFSET64 extern int mkostemp (char *__template, int __flags) __nonnull ((1)) __wur; |