From d010391ac8f706e17998671534ca1230f68d2f38 Mon Sep 17 00:00:00 2001 From: Bruce Momjian Date: Sat, 27 Aug 2011 09:24:27 -0400 Subject: [PATCH] Add support for #elif to pgrminclude. --- src/tools/pginclude/pgrminclude | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/tools/pginclude/pgrminclude b/src/tools/pginclude/pgrminclude index 64d7ef71998..26a36c9a4a0 100755 --- a/src/tools/pginclude/pgrminclude +++ b/src/tools/pginclude/pgrminclude @@ -43,15 +43,16 @@ do # preserve configure-specific includes # these includes are surrounded by #ifdef's grep -B1 '^#include[ ][ ]*[<"]'"$INCLUDE"'[>"]' "$FILE" | - egrep -q '^#if|^#else' && continue + egrep -q '^#if|^#else|^#elif' && continue grep -A1 '^#include[ ][ ]*[<"]'"$INCLUDE"'[>"]' "$FILE" | - egrep -q '^#else|^#endif' && continue + egrep -q '^#else|^#elif|^#endif' && continue # Remove all #if and #ifdef blocks because the blocks # might contain code that is not compiled on this platform. cat "$FILE" | grep -v "^#if" | grep -v "^#else" | + grep -v "^#elif" | grep -v "^#endif" >/tmp/$$a # set up initial file contents