diff options
| author | Luboš Luňák <l.lunak@suse.cz> | 2012-12-18 16:53:31 +0100 |
|---|---|---|
| committer | Luboš Luňák <l.lunak@suse.cz> | 2012-12-18 16:56:33 +0100 |
| commit | 626969aa7cce72692767e265a2a98ef111202487 (patch) | |
| tree | 85dfaadd0deb1be301f89100df824639aaf4a4ea | |
| parent | 17e0f42234c67df60e5599289fdb2cda683bea6e (diff) | |
fix conditionals detection
Change-Id: I50b335375b8b2ac67c50f887a4eb58456b9cea33
| -rwxr-xr-x | solenv/bin/update_pch.sh | 6 | ||||
| -rw-r--r-- | svx/inc/pch/precompiled_svx.hxx | 7 |
2 files changed, 4 insertions, 9 deletions
diff --git a/solenv/bin/update_pch.sh b/solenv/bin/update_pch.sh index 0cda8f494801..1302df4faf38 100755 --- a/solenv/bin/update_pch.sh +++ b/solenv/bin/update_pch.sh @@ -30,7 +30,7 @@ for x in $headers; do inobjects= ifstack=0 while read line ; do - if (test "$line" = "))") || (echo $line | grep -q ", "); then + if test "$line" = "))" ; then inobjects= elif echo $line | grep -q -e add_exception_objects -e add_noexception_objects -e add_cxxobject -e add_cxxobjects ; then inobjects=1 @@ -43,7 +43,9 @@ for x in $headers; do ifstack=$((ifstack - 1)) elif test -n "$inobjects" -a $ifstack -eq 0; then file=$line - if ! test -f "$root/$file".cxx ; then + if echo $line | grep -q ", "; then + true # $if() probably, or something similar + elif ! test -f "$root/$file".cxx ; then echo No file $file in $module/$makefile >&2 else cat "$root/$file".cxx | grep -e '^\s*#include' | sed 's/\(#include [<"][^>"]*[>"]\).*/\1/' | sed 's#\.\./##g#' >>$tmpfile diff --git a/svx/inc/pch/precompiled_svx.hxx b/svx/inc/pch/precompiled_svx.hxx index 1f5c0396c048..13b85611cdab 100644 --- a/svx/inc/pch/precompiled_svx.hxx +++ b/svx/inc/pch/precompiled_svx.hxx @@ -250,21 +250,16 @@ #include <numeric> #include "osl/diagnose.h" #include <osl/diagnose.h> -#include "osl/file.hxx" #include <osl/file.hxx> #include <osl/interlck.h> #include <osl/mutex.hxx> #include <osl/nlsupport.h> -#include "osl/process.h" #include <osl/security.hxx> -#include <pwd.h> -#include "rtl/bootstrap.hxx" #include <rtl/bootstrap.hxx> #include <rtl/instance.hxx> #include <rtl/locale.h> #include <rtl/math.hxx> #include <rtl/ref.hxx> -#include "rtl/strbuf.hxx" #include <rtl/strbuf.hxx> #include <rtl/tencinfo.h> #include <rtl/textenc.h> @@ -354,7 +349,6 @@ #include <toolkit/helper/externallock.hxx> #include <toolkit/helper/vclunohelper.hxx> #include <toolkit/unohlp.hxx> -#include "tools/appendunixshellword.hxx" #include <tools/color.hxx> #include <tools/debug.hxx> #include <tools/errinf.hxx> @@ -370,7 +364,6 @@ #include <tools/string.hxx> #include <tools/urlobj.hxx> #include <unicode/uchar.h> -#include <unistd.h> #include "uno/lbnames.h" #include <uno/mapping.hxx> #include <unotools/accessiblerelationsethelper.hxx> |