(environ): Make declaration conditional.

(main: -g debugging setup): Get rid of \ in #if condition.

From-SVN: r1912

diff --git a/gcc/toplev.c b/gcc/toplev.c
index 2dd007c0bd96c76ce571e3fba4ee335ec94f254a..93dcc2bf2107676fc015fe878775f4f283c7879c 100644 (file)
--- a/gcc/toplev.c
+++ b/gcc/toplev.c
@@ -77,7 +77,9 @@ VMS_fopen (fname, type)
 
 extern int rtx_equal_function_value_matters;
 
+#if ! (defined (VMS) && defined (OS2))
 extern char **environ;
+#endif
 extern char *version_string, *language_string;
 
 extern void init_lex ();
@@ -2933,8 +2935,8 @@ main (argc, argv, envp)
              /* If more than one debugging type is supported,
                 you must define PREFERRED_DEBUGGING_TYPE
                 to choose a format in a system-dependent way.  */
-#if 1 < (defined (DBX_DEBUGGING_INFO) + defined (SDB_DEBUGGING_INFO) \
-        + defined (DWARF_DEBUGGING_INFO) + defined (XCOFF_DEBUGGING_INFO))
+             /* This is one long line cause VAXC can't handle a \-newline.  */
+#if 1 < (defined (DBX_DEBUGGING_INFO) + defined (SDB_DEBUGGING_INFO) + defined (DWARF_DEBUGGING_INFO) + defined (XCOFF_DEBUGGING_INFO))
 #ifdef PREFERRED_DEBUGGING_TYPE
              if (!strncmp (str, "ggdb", len))
                write_symbols = PREFERRED_DEBUGGING_TYPE;