[Libreoffice-commits] .: 2 commits - odk/source xmerge/Module_xmerge.mk

[Matus Kukan]

 odk/source/unoapploader/win/unoapploader.c |    3 ++-
 xmerge/Module_xmerge.mk                    |   14 ++++++++------
 2 files changed, 10 insertions(+), 7 deletions(-)

New commits:
commit 8ac7152ca8b3b71c17ea55ec9e660804990ab86c
Author: Matúš Kukan <matus.kukan at gmail.com>
Date:   Sat Oct 8 10:56:27 2011 +0200

    Don't build jars when java is disabled

diff --git a/xmerge/Module_xmerge.mk b/xmerge/Module_xmerge.mk
index b5ef278..3b8503c 100644
--- a/xmerge/Module_xmerge.mk
+++ b/xmerge/Module_xmerge.mk
@@ -29,11 +29,13 @@
 $(eval $(call gb_Module_Module,xmerge))
 
 $(eval $(call gb_Module_add_targets,xmerge,\
-	Jar_aportisdoc \
-	Jar_htmlsoff \
-	Jar_pexcel \
-	Jar_pocketword \
-	Jar_xmerge \
-	Jar_XMergeBridge \
+	$(if $(SOLAR_JAVA), \
+		Jar_aportisdoc \
+		Jar_htmlsoff \
+		Jar_pexcel \
+		Jar_pocketword \
+		Jar_xmerge \
+		Jar_XMergeBridge \
+	) \
 	Package_xmergesync \
 ))
commit 7e9a597202568a812a6470939b0ad1a693685adc
Author: Matúš Kukan <matus.kukan at gmail.com>
Date:   Sat Oct 8 10:19:23 2011 +0200

    Revert "cppcheck reduce scope of var in odk/..unoapploader.c"
    
    This reverts commit 595de860c7a3fb274d2cf432bd1fa04a008503a0.
    MSVC couldn't handle this.

diff --git a/odk/source/unoapploader/win/unoapploader.c b/odk/source/unoapploader/win/unoapploader.c
index 990b002..762b554 100644
--- a/odk/source/unoapploader/win/unoapploader.c
+++ b/odk/source/unoapploader/win/unoapploader.c
@@ -81,6 +81,7 @@ int WINAPI WinMain( HINSTANCE hInstance, HINSTANCE hPrevInstance,
     char* value = NULL;
     char* envstr = NULL;
     char* cmdline = NULL;
+    int size;
     STARTUPINFO startup_info;
     PROCESS_INFORMATION process_info;
     BOOL bCreate;
@@ -229,7 +230,7 @@ int WINAPI WinMain( HINSTANCE hInstance, HINSTANCE hPrevInstance,
          * note that this only affects the environment variable of the current
          * process, the command processor's environment is not changed
          */
-        int size = strlen( ENVVARNAME ) + strlen( "=" ) + strlen( path ) + 1;
+        size = strlen( ENVVARNAME ) + strlen( "=" ) + strlen( path ) + 1;
         if ( value != NULL )
             size += strlen( PATHSEPARATOR ) + strlen( value );
         envstr = (char*) malloc( size );