summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorJakub Jelinek <jakub@redhat.com>2006-02-03 09:39:28 +0000
committerJakub Jelinek <jakub@redhat.com>2006-02-03 09:39:28 +0000
commit9f57ac239bd04f64ae20f6e7b35f387ae6605312 (patch)
tree1971d9c5a6261ff535fec20e8be494fac1f61eb2 /include
parentc3a8c11b0c6a6e44e98dcd4bb0fdb397e4fd56f7 (diff)
Updated to fedora-glibc-20060203T0932
Diffstat (limited to 'include')
-rw-r--r--include/errno.h2
-rw-r--r--include/sys/time.h1
2 files changed, 2 insertions, 1 deletions
diff --git a/include/errno.h b/include/errno.h
index 9865903b86..fe8bca44c5 100644
--- a/include/errno.h
+++ b/include/errno.h
@@ -2,7 +2,7 @@
#include <stdlib/errno.h>
-#if defined _ERRNO_H && !defined _ISOMAC
+#if defined _ERRNO_H && !defined _ISOMAC && !defined __cplusplus
# ifdef IS_IN_rtld
# include <dl-sysdep.h>
diff --git a/include/sys/time.h b/include/sys/time.h
index c70396f04e..ec4055276e 100644
--- a/include/sys/time.h
+++ b/include/sys/time.h
@@ -20,6 +20,7 @@ extern int __setitimer (enum __itimer_which __which,
attribute_hidden;
extern int __utimes (__const char *__file, const struct timeval __tvp[2])
attribute_hidden;
+extern int __futimes (int fd, __const struct timeval tvp[2]) attribute_hidden;
#ifndef NOT_IN_libc
# define __gettimeofday(tv, tz) INTUSE(__gettimeofday) (tv, tz)