From 4851089fc69c0a249ff82f307829b47dc3856ee0 Mon Sep 17 00:00:00 2001
From: Ian Lance Taylor <iant@google.com>
Date: Mon, 1 Jun 2009 15:37:03 +0000
Subject: [PATCH] cpp-id-data.h: Add extern "C".
* include/cpp-id-data.h: Add extern "C".
* include/line-map.h: Likewise.
* include/mkdeps.h: Likewise.
* include/symtab.h: Likewise.
* internal.h: Likewise.
From-SVN: r148051
---
libcpp/ChangeLog | 8 ++++++++
libcpp/include/cpp-id-data.h | 8 ++++++++
libcpp/include/line-map.h | 9 +++++++++
libcpp/include/mkdeps.h | 8 ++++++++
libcpp/include/symtab.h | 9 +++++++++
libcpp/internal.h | 8 ++++++++
6 files changed, 50 insertions(+)
diff --git a/libcpp/ChangeLog b/libcpp/ChangeLog
index f604c48d1d6e..f8645283e0f7 100644
--- a/libcpp/ChangeLog
+++ b/libcpp/ChangeLog
@@ -1,3 +1,11 @@
+2009-06-01 Ian Lance Taylor <iant@google.com>
+
+ * include/cpp-id-data.h: Add extern "C".
+ * include/line-map.h: Likewise.
+ * include/mkdeps.h: Likewise.
+ * include/symtab.h: Likewise.
+ * internal.h: Likewise.
+
2009-05-15 Ian Lance Taylor <iant@google.com>
* include/cpplib.h (enum cpp_builtin_type): Rename from enum
diff --git a/libcpp/include/cpp-id-data.h b/libcpp/include/cpp-id-data.h
index a57edad521d5..d2adbfaebdf1 100644
--- a/libcpp/include/cpp-id-data.h
+++ b/libcpp/include/cpp-id-data.h
@@ -18,6 +18,10 @@ along with this program; see the file COPYING3. If not see
#include "cpplib.h"
+#ifdef __cplusplus
+extern "C" {
+#endif
+
#if !defined (HAVE_UCHAR) && !defined (IN_GCC)
typedef unsigned char uchar;
#endif
@@ -79,3 +83,7 @@ struct GTY(()) cpp_macro {
tokens. */
unsigned int extra_tokens : 1;
};
+
+#ifdef __cplusplus
+}
+#endif
diff --git a/libcpp/include/line-map.h b/libcpp/include/line-map.h
index b556013af62a..962525f156b6 100644
--- a/libcpp/include/line-map.h
+++ b/libcpp/include/line-map.h
@@ -23,6 +23,10 @@ along with this program; see the file COPYING3. If not see
#ifndef LIBCPP_LINE_MAP_H
#define LIBCPP_LINE_MAP_H
+#ifdef __cplusplus
+extern "C" {
+#endif
+
#ifndef GTY
#define GTY(x) /* nothing */
#endif
@@ -184,4 +188,9 @@ extern const struct line_map *linemap_lookup
extern source_location
linemap_position_for_column (struct line_maps *set, unsigned int to_column);
+
+#ifdef __cplusplus
+}
+#endif
+
#endif /* !LIBCPP_LINE_MAP_H */
diff --git a/libcpp/include/mkdeps.h b/libcpp/include/mkdeps.h
index 50bcee40726f..def7b5641f89 100644
--- a/libcpp/include/mkdeps.h
+++ b/libcpp/include/mkdeps.h
@@ -23,6 +23,10 @@ along with this program; see the file COPYING3. If not see
#ifndef LIBCPP_MKDEPS_H
#define LIBCPP_MKDEPS_H
+#ifdef __cplusplus
+extern "C" {
+#endif
+
/* This is the data structure used by all the functions in mkdeps.c.
It's quite straightforward, but should be treated as opaque. */
@@ -76,4 +80,8 @@ extern int deps_restore (struct deps *, FILE *, const char *);
automatic dependency schemes. */
extern void deps_phony_targets (const struct deps *, FILE *);
+#ifdef __cplusplus
+}
+#endif
+
#endif /* ! LIBCPP_MKDEPS_H */
diff --git a/libcpp/include/symtab.h b/libcpp/include/symtab.h
index e7c593731bc9..e1bc00cb6f6a 100644
--- a/libcpp/include/symtab.h
+++ b/libcpp/include/symtab.h
@@ -20,6 +20,11 @@ along with this program; see the file COPYING3. If not see
#define LIBCPP_SYMTAB_H
#include "obstack.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
#ifndef GTY
#define GTY(x) /* nothing */
#endif
@@ -99,4 +104,8 @@ extern void ht_load (hash_table *ht, hashnode *entries,
/* Dump allocation statistics to stderr. */
extern void ht_dump_statistics (hash_table *);
+#ifdef __cplusplus
+}
+#endif
+
#endif /* LIBCPP_SYMTAB_H */
diff --git a/libcpp/internal.h b/libcpp/internal.h
index 22e6d238906a..21e51c6553c6 100644
--- a/libcpp/internal.h
+++ b/libcpp/internal.h
@@ -33,6 +33,10 @@ along with this program; see the file COPYING3. If not see
typedef int iconv_t; /* dummy */
#endif
+#ifdef __cplusplus
+extern "C" {
+#endif
+
struct directive; /* Deliberately incomplete. */
struct pending_option;
struct op;
@@ -702,4 +706,8 @@ ufputs (const unsigned char *s, FILE *f)
return fputs ((const char *)s, f);
}
+#ifdef __cplusplus
+}
+#endif
+
#endif /* ! LIBCPP_INTERNAL_H */
--
GitLab