Remove everything after #endif, instead of trying

to turn it into comments, which loses inside comments.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@4811 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/fixinc.svr4 b/gcc/fixinc.svr4
index 244c678..185d974 100755 (executable)
--- a/gcc/fixinc.svr4
+++ b/gcc/fixinc.svr4
@@ -162,8 +162,10 @@ while [ $# != 0 ]; do
 # The change of u_char, etc, to u_int
 # applies to bit fields.
        sed -e '
-         s%^\([        ]*#[    ]*endif[        ]*\)\([^/       ].*\)$%\1/* \2 */%
-         s%^\([        ]*#[    ]*else[         ]*\)\([^/       ].*\)$%\1/* \2 */%
+         s%^\([        ]*#[    ]*else\)[       ]*/[^*].*%\1%
+         s%^\([        ]*#[    ]*else\)[       ]*[^/   ].*%\1%
+         s%^\([        ]*#[    ]*endif\)[      ]*/[^*].*%\1%
+         s%^\([        ]*#[    ]*endif\)[      ]*[^/   ].*%\1%
          s/#lint(on)/defined(lint)/g
          s/#lint(off)/!defined(lint)/g
          s/#machine(\([^)]*\))/defined(__\1__)/g