summaryrefslogtreecommitdiffstats
path: root/libc/include
diff options
context:
space:
mode:
authorFred Fettinger <fred.fettinger@motorola.com>2009-11-23 13:39:03 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2009-11-23 13:39:03 -0800
commit01a1f8b080d9d4e619ce00039f195f6fa3aa2045 (patch)
treeb498b2eaf9e522fb981adb53da4625db017ad06a /libc/include
parent9cb69cf4dc8962204715a7662c7d0e778a7ee113 (diff)
parentb5239ed16aeba648f1c9bcb7a4887b8a41670326 (diff)
downloadbionic-01a1f8b080d9d4e619ce00039f195f6fa3aa2045.zip
bionic-01a1f8b080d9d4e619ce00039f195f6fa3aa2045.tar.gz
bionic-01a1f8b080d9d4e619ce00039f195f6fa3aa2045.tar.bz2
am b5239ed1: libc: allow usage of time64.h from cpp code
Merge commit 'b5239ed16aeba648f1c9bcb7a4887b8a41670326' into eclair-mr2-plus-aosp * commit 'b5239ed16aeba648f1c9bcb7a4887b8a41670326': libc: allow usage of time64.h from cpp code
Diffstat (limited to 'libc/include')
-rw-r--r--libc/include/time64.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/libc/include/time64.h b/libc/include/time64.h
index 9da4bc7..7ec05af 100644
--- a/libc/include/time64.h
+++ b/libc/include/time64.h
@@ -31,9 +31,12 @@ Modified for Bionic by the Android Open Source Project
#ifndef TIME64_H
#define TIME64_H
+#include <sys/cdefs.h>
#include <time.h>
#include <stdint.h>
+__BEGIN_DECLS
+
typedef int64_t time64_t;
struct tm *gmtime64_r (const time64_t *, struct tm *);
@@ -51,4 +54,6 @@ time64_t timegm64 (const struct tm *);
time64_t mktime64 (const struct tm *);
time64_t timelocal64 (const struct tm *);
+__END_DECLS
+
#endif /* TIME64_H */