aboutsummaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2005-12-23 01:55:26 +0000
committerUlrich Drepper <drepper@redhat.com>2005-12-23 01:55:26 +0000
commit7735afa212034346f31baa6aee5466de74309541 (patch)
treeeaabd29135191d9edf4f6c2f5fcd75e2a57e69a9 /include
parent331926097f7dd22ef585d75c16bc5d992b991ee4 (diff)
downloadglibc-7735afa212034346f31baa6aee5466de74309541.zip
glibc-7735afa212034346f31baa6aee5466de74309541.tar.gz
glibc-7735afa212034346f31baa6aee5466de74309541.tar.bz2
* Makeconfig: Define CXXFLAGS. Split out warnings from +gccwarn which
are not understood by the C++ compiler. * Makerules: Add rules to build C++ code for test cases. * include/stdlib.h: Protect for inclusion in C++ code. * include/time.h: Likewise. * test-skeleton.c (timeout_handler): Rewrite ts initialization for C++ compatibility.
Diffstat (limited to 'include')
-rw-r--r--include/stdlib.h4
-rw-r--r--include/time.h8
2 files changed, 12 insertions, 0 deletions
diff --git a/include/stdlib.h b/include/stdlib.h
index 49e8757..90b779d 100644
--- a/include/stdlib.h
+++ b/include/stdlib.h
@@ -10,6 +10,8 @@
/* Now define the internal interfaces. */
#ifndef __Need_M_And_C
+__BEGIN_DECLS
+
extern __typeof (strtol_l) __strtol_l;
extern __typeof (strtoul_l) __strtoul_l;
extern __typeof (strtoll_l) __strtoll_l;
@@ -197,6 +199,8 @@ __strtoull_l (__const char * __restrict __nptr, char **__restrict __endptr,
extern void * __default_morecore (ptrdiff_t);
libc_hidden_proto (__default_morecore)
+__END_DECLS
+
#undef __Need_M_And_C
#endif /* include/stdlib.h */
diff --git a/include/time.h b/include/time.h
index c2171ef..adf2dea 100644
--- a/include/time.h
+++ b/include/time.h
@@ -5,6 +5,8 @@
# include <time/time.h>
# include <xlocale.h>
+__BEGIN_DECLS
+
extern __typeof (strftime_l) __strftime_l;
libc_hidden_proto (__strftime_l)
extern __typeof (strptime_l) __strptime_l;
@@ -89,6 +91,8 @@ extern int __getclktck (void);
/* strptime support. */
/* Status of lookup: do we use the locale data or the raw data? */
+#ifndef __cplusplus
+// C++ cannot deal with using 'not'.
enum ptime_locale_status { not, loc, raw };
extern char * __strptime_internal (const char *rp, const char *fmt,
@@ -96,6 +100,7 @@ extern char * __strptime_internal (const char *rp, const char *fmt,
enum ptime_locale_status *decided,
int era_cnt, __locale_t locparam)
internal_function;
+#endif
extern double __difftime (time_t time1, time_t time0);
@@ -105,5 +110,8 @@ extern double __difftime (time_t time1, time_t time0);
#ifndef _ISOMAC
# define CLOCK_IDFIELD_SIZE 3
#endif
+
+__END_DECLS
+
#endif
#endif