[Libreoffice-commits] .: 2 commits - pyuno/prj sal/inc

[Tor Lillqvist]

 pyuno/prj/build.lst |    2 +-
 sal/inc/sal/main.h  |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit e2562f348601c51a0e387686365af632229351d4
Author: Tor Lillqvist <tml at iki.fi>
Date:   Sat Jul 9 15:06:52 2011 +0300

    Build cpputools only for desktop OSes

diff --git a/pyuno/prj/build.lst b/pyuno/prj/build.lst
index a7c1c5b..e6e0914 100644
--- a/pyuno/prj/build.lst
+++ b/pyuno/prj/build.lst
@@ -1,4 +1,4 @@
-bgpu  pyuno : stoc cpputools cppuhelper bridges tools PYTHON:python LIBXSLT:libxslt NULL
+bgpu  pyuno : stoc DESKTOP:cpputools cppuhelper bridges tools PYTHON:python LIBXSLT:libxslt NULL
 pu    pyuno usr1 - all br_mkout NULL
 pu    pyuno\zipcore nmake - all pu_zipcore NULL
 pu    pyuno\source\module nmake - all pu_module NULL
commit 17bcbd1d7cd9218c70ae772e16ceb9664a91a8d7
Author: Tor Lillqvist <tml at iki.fi>
Date:   Sat Jul 9 15:06:27 2011 +0300

    sal_main_with_args() is static

diff --git a/sal/inc/sal/main.h b/sal/inc/sal/main.h
index 190aaed..fdd99ac 100644
--- a/sal/inc/sal/main.h
+++ b/sal/inc/sal/main.h
@@ -68,7 +68,7 @@ int SAL_CALL main(int argc, char ** argv) \
 #define SAL_MAIN_IMPL \
 SAL_MAIN_WITH_ARGS_IMPL \
  \
-int \
+static int \
 sal_main_with_args(int argc, char ** argv) \
 { \
     return sal_main(); \
@@ -78,7 +78,7 @@ sal_main_with_args(int argc, char ** argv) \
 }
 @end
 
-int sal_main_with_args(int argc, char **argv);
+static int sal_main_with_args(int argc, char **argv);
 
 @implementation salAppDelegate