[Libreoffice-commits] .: 2 commits - bridges/source jvmaccess/inc

[Tor Lillqvist]

 bridges/source/cpp_uno/msvc_win32_x86-64/codeSnippet.asm |   11 ++++-------
 jvmaccess/inc/jvmaccess/virtualmachine.hxx               |    6 ++++--
 2 files changed, 8 insertions(+), 9 deletions(-)

New commits:
commit 6c405a4ebaa28137be7156ce02f0d9638adf1dd1
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Fri Jan 28 00:07:49 2011 +0200

    Need to use exactly the same names as in the JDK in the non-SOLAR_JAVA case
    
    Use struct JNIEnv_ and struct JavaVM_, with underscores. Otherwise a
    mangled name in the map files won't match.

diff --git a/jvmaccess/inc/jvmaccess/virtualmachine.hxx b/jvmaccess/inc/jvmaccess/virtualmachine.hxx
index e352bad..7097932 100644
--- a/jvmaccess/inc/jvmaccess/virtualmachine.hxx
+++ b/jvmaccess/inc/jvmaccess/virtualmachine.hxx
@@ -35,8 +35,10 @@
 #ifdef SOLAR_JAVA
 #include "jni.h"
 #else
-struct JNIEnv;
-struct JavaVM;
+struct JNIEnv_;
+typedef JNIEnv_ JNIEnv;
+struct JavaVM_;
+typedef JavaVM_ JavaVM;
 typedef int jint;
 typedef void * jobject;
 #endif
commit 17b7ca8f23c25e1e276485642fc4dbf486550620
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Thu Jan 27 23:58:27 2011 +0200

    Corect copyright header and comment

diff --git a/bridges/source/cpp_uno/msvc_win32_x86-64/codeSnippet.asm b/bridges/source/cpp_uno/msvc_win32_x86-64/codeSnippet.asm
index 30322d3..377132a 100644
--- a/bridges/source/cpp_uno/msvc_win32_x86-64/codeSnippet.asm
+++ b/bridges/source/cpp_uno/msvc_win32_x86-64/codeSnippet.asm
@@ -14,11 +14,11 @@
 ;;
 ;; The Initial Developer of the Original Code is
 ;;       Novell, Inc.
-;; Portions created by the Initial Developer are Copyright (C) 2011 the
-;; Initial Developer. All Rights Reserved.
+;; Portions created by the Initial Developer are Copyright (C) 2011
+;; Novell, Inc. All Rights Reserved.
 ;;
 ;; Major Contributor(s):
-;; Tor Lillqvist <tml at iki.fi>
+;;       Tor Lillqvist <tml at iki.fi>
 ;; Portions created by Tor Lillqvist are Copyright (C) 2011 Tor Lillqvist. All Rights Reserved.
 ;;
 ;; For minor contributions see the git repository.
@@ -40,10 +40,7 @@
 ;; codeSnippet().
 
 ;; This is in a separate file for x86-64 as MSVC doesn't have in-line
-;; assembly for x64. The code here is still partly just a crude copy of
-;; the in-line x86 code from ../msvc_win32_intel that is totally
-;; pointless on x64. But parts have been properly changed into x64
-;; calling convention and might even work.
+;; assembly for x64.
 
 ;; Random web links and other documentation about low-level
 ;; implementation details for the C++/UNO bridge on x64 Windows kept