From f1bf410cad9090bf20dd6ab357fdb5d8eeb176b8 Mon Sep 17 00:00:00 2001 From: Jerry Quinn Date: Sat, 18 Jul 2009 03:22:16 +0000 Subject: directives.c (do_linemarker, do_line): Use CPP_STRING for ignored enum value. 2009-07-17 Jerry Quinn * directives.c (do_linemarker, do_line): Use CPP_STRING for ignored enum value. * files.c (find_file_in_dir): Add cast from void* to char*. * symtab.c (ht_lookup_with_hash): Add cast from void* to char*. * Makefile.in: (WARN_CFLAGS): Use general and C-specific warnings. (CXX, CXXFLAGS, WARN_CXXFLAGS, ALL_CXXFLAGS, ENABLE_BUILD_WITH_CXX, CCDEPMODE, CXXDEPMODE, COMPILER, COMPILER_FLAGS): New. (DEPMODE): Set from CCDEPMODE or CXXDEPMODE. (COMPILE.base): Use COMPILER instead of CC. Use COMPILER_FLAGS instead of ALL_CFLAGS. * configure.ac: Invoke AC_PROG_CXX. Separate C-specific warnings from other warnings. Add -Wc++-compat to C-specific warnings. Check for --enable-build-with-cxx. Set and substitute ENABLE_BUILD_WITH_CXX. Invoke ZW_PROG_COMPILER_DEPENDENCIES according to ENABLE_BUILD_WITH_CXX. Invoke AC_LANG before AC_CHECK_HEADERS. * configure: Rebuild. * include/cpp-id-data.h: Remove extern "C". * include/line-map.h: Likewise. * include/mkdeps.h: Likewise. * include/symtab.h: Likewise. * internal.h: Likewise. From-SVN: r149763 --- libcpp/include/cpp-id-data.h | 8 -------- libcpp/include/cpplib.h | 8 -------- libcpp/include/line-map.h | 8 -------- libcpp/include/mkdeps.h | 8 -------- libcpp/include/symtab.h | 8 -------- 5 files changed, 40 deletions(-) (limited to 'libcpp/include') diff --git a/libcpp/include/cpp-id-data.h b/libcpp/include/cpp-id-data.h index d2adbfa..a57edad 100644 --- a/libcpp/include/cpp-id-data.h +++ b/libcpp/include/cpp-id-data.h @@ -18,10 +18,6 @@ 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 @@ -83,7 +79,3 @@ struct GTY(()) cpp_macro { tokens. */ unsigned int extra_tokens : 1; }; - -#ifdef __cplusplus -} -#endif diff --git a/libcpp/include/cpplib.h b/libcpp/include/cpplib.h index d39b80e..71c7ef2 100644 --- a/libcpp/include/cpplib.h +++ b/libcpp/include/cpplib.h @@ -28,10 +28,6 @@ along with this program; see the file COPYING3. If not see #include "symtab.h" #include "line-map.h" -#ifdef __cplusplus -extern "C" { -#endif - typedef struct cpp_reader cpp_reader; typedef struct cpp_buffer cpp_buffer; typedef struct cpp_options cpp_options; @@ -933,8 +929,4 @@ extern void cpp_prepare_state (cpp_reader *, struct save_macro_data **); extern int cpp_read_state (cpp_reader *, const char *, FILE *, struct save_macro_data *); -#ifdef __cplusplus -} -#endif - #endif /* ! LIBCPP_CPPLIB_H */ diff --git a/libcpp/include/line-map.h b/libcpp/include/line-map.h index 09e72f1..31ac8e5 100644 --- a/libcpp/include/line-map.h +++ b/libcpp/include/line-map.h @@ -23,10 +23,6 @@ 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 @@ -191,8 +187,4 @@ 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 def7b56..50bcee4 100644 --- a/libcpp/include/mkdeps.h +++ b/libcpp/include/mkdeps.h @@ -23,10 +23,6 @@ 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. */ @@ -80,8 +76,4 @@ 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 e1bc00c..ebb5600 100644 --- a/libcpp/include/symtab.h +++ b/libcpp/include/symtab.h @@ -21,10 +21,6 @@ along with this program; see the file COPYING3. If not see #include "obstack.h" -#ifdef __cplusplus -extern "C" { -#endif - #ifndef GTY #define GTY(x) /* nothing */ #endif @@ -104,8 +100,4 @@ 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 */ -- cgit v1.1