summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--stdlib/stdlib.h4
2 files changed, 6 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 61c64db6c8..736bd5d778 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-01-13 Ulrich Drepper <drepper@redhat.com>
+
+ * stdlib/stdlib.h: Be a bit more relaxed about obsoleted mktemp symbol.
+
2010-01-12 Ulrich Drepper <drepper@redhat.com>
* conform/data/complex.h-data: Test for POSIX2008.
diff --git a/stdlib/stdlib.h b/stdlib/stdlib.h
index 75750205c8..bac8ed65be 100644
--- a/stdlib/stdlib.h
+++ b/stdlib/stdlib.h
@@ -597,8 +597,8 @@ extern int clearenv (void) __THROW;
#endif
-#if ((defined __USE_MISC || defined __USE_XOPEN_EXTENDED) \
- && !defined __USE_XOPEN2K) || defined __USE_GNU
+#if defined __USE_MISC \
+ || (defined __USE_XOPEN_EXTENDED && !defined __USE_XOPEN2K)
/* Generate a unique temporary file name from TEMPLATE.
The last six characters of TEMPLATE must be "XXXXXX";
they are replaced with a string that makes the file name unique.