Change -x language option to use new objective c standard for gcc and clang

When preprocessing objective-c[++] files, use -x objective-c-cpp-output or
-x objective-c++-cpp-output which is supported by gcc 4.0+ and clang.
Previously, -x objc-cpp-output or -x objc++-cpp-output was used, but not
supported by clang.

diff --git a/language.c b/language.c
index acbeb89c39aa8454e3d22408fa1d60d6695ac0e8..3700476f828ccf01af2f5d435cd60c90318e2328 100644 (file)
--- a/language.c
+++ b/language.c
@@ -44,8 +44,8 @@ static const struct {
        /* Preprocessed: */
        {".i",   "cpp-output"},
        {".ii",  "c++-cpp-output"},
-       {".mi",  "objc-cpp-output"},
-       {".mii", "objc++-cpp-output"},
+       {".mi",  "objective-c-cpp-output"},
+       {".mii", "objective-c++-cpp-output"},
        /* Header file (for precompilation): */
        {".h",   "c-header"},
        {".H",   "c++-header"},
@@ -70,18 +70,20 @@ static const struct {
        const char *language;
        const char *p_language;
 } languages[] = {
-       {"c",                    "cpp-output"},
-       {"cpp-output",           "cpp-output"},
-       {"c-header",             "cpp-output"},
-       {"c++",                  "c++-cpp-output"},
-       {"c++-cpp-output",       "c++-cpp-output"},
-       {"c++-header",           "c++-cpp-output"},
-       {"objective-c",          "objc-cpp-output"},
-       {"objective-c-header",   "objc-cpp-output"},
-       {"objc-cpp-output",      "objc-cpp-output"},
-       {"objective-c++",        "objc++-cpp-output"},
-       {"objc++-cpp-output",    "objc++-cpp-output"},
-       {"objective-c++-header", "objc++-cpp-output"},
+       {"c",                        "cpp-output"},
+       {"cpp-output",               "cpp-output"},
+       {"c-header",                 "cpp-output"},
+       {"c++",                      "c++-cpp-output"},
+       {"c++-cpp-output",           "c++-cpp-output"},
+       {"c++-header",               "c++-cpp-output"},
+       {"objective-c",              "objective-c-cpp-output"},
+       {"objective-c-header",       "objective-c-cpp-output"},
+       {"objc-cpp-output",          "objective-c-cpp-output"},
+       {"objective-c-cpp-output",   "objective-c-cpp-output"},
+       {"objective-c++",            "objective-c++-cpp-output"},
+       {"objc++-cpp-output",        "objective-c++-cpp-output"},
+       {"objective-c++-header",     "objective-c++-cpp-output"},
+       {"objective-c++-cpp-output", "objective-c++-cpp-output"},
        {NULL,  NULL}};
 
 /*