[Libreoffice-commits] .: 2 commits - jvmaccess/util sal/inc

[Tor Lillqvist]

 jvmaccess/util/makefile.mk           |    2 +
 jvmaccess/util/msvc_win32_x86-64.map |   37 +++++++++++++++++++++++++++++++++++
 sal/inc/sal/types.h                  |    8 +++++--
 3 files changed, 45 insertions(+), 2 deletions(-)

New commits:
commit 513ad4c413b17175e816f007c825fed2932cf2b7
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Sat Jan 22 02:12:58 2011 +0200

    Define SAL_TYPES_SIZEOFPOINTER for x64 Windows

diff --git a/sal/inc/sal/types.h b/sal/inc/sal/types.h
index f440094..0e197f3 100644
--- a/sal/inc/sal/types.h
+++ b/sal/inc/sal/types.h
@@ -43,8 +43,12 @@
   #define SAL_TYPES_SIZEOFSHORT		2
   #define SAL_TYPES_SIZEOFINT 		4
   #define SAL_TYPES_SIZEOFLONG		4
-  #define SAL_TYPES_SIZEOFLONGLONG		8
-  #define SAL_TYPES_SIZEOFPOINTER		4
+  #define SAL_TYPES_SIZEOFLONGLONG	8
+  #ifdef _WIN64
+    #define SAL_TYPES_SIZEOFPOINTER	8
+  #else
+    #define SAL_TYPES_SIZEOFPOINTER	4
+  #endif
 #endif
 
 #ifdef __cplusplus
commit 42a12264d4eb10db1841e83b7dd8a5ddca97d9f1
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Sat Jan 22 02:06:43 2011 +0200

    Use separate .map files for 64-bit MSVC build

diff --git a/jvmaccess/util/makefile.mk b/jvmaccess/util/makefile.mk
index 1dc327c..a1d8536 100644
--- a/jvmaccess/util/makefile.mk
+++ b/jvmaccess/util/makefile.mk
@@ -53,6 +53,8 @@ SHL1RPATH = URELIB
 
 .IF "$(COMNAME)" == "msci"
 SHL1VERSIONMAP = msvc_win32_intel.map
+.ELIF "$(COMNAME)" == "mscx"
+SHL1VERSIONMAP = msvc_win32_x86-64.map
 .ELIF "$(COMNAME)" == "sunpro5"
 SHL1VERSIONMAP = cc5_solaris_sparc.map
 .ELIF "$(GUI)$(COM)" == "WNTGCC"
diff --git a/jvmaccess/util/msvc_win32_x86-64.map b/jvmaccess/util/msvc_win32_x86-64.map
new file mode 100644
index 0000000..d75ab1c
--- /dev/null
+++ b/jvmaccess/util/msvc_win32_x86-64.map
@@ -0,0 +1,37 @@
+UDK_3.1 {
+    global:
+        # jvmaccess/virtualmachine.hxx:
+        ??0CreationException at AttachGuard@VirtualMachine at jvmaccess@@QEAA at XZ; # jvmaccess::VirtualMachine::AttachGuard::CreationException::CreationException()
+        ??0CreationException at AttachGuard@VirtualMachine at jvmaccess@@QEAA at AEBV0123@@Z; # jvmaccess::VirtualMachine::AttachGuard::CreationException::CreationException(CreationException const &)
+        ??1CreationException at AttachGuard@VirtualMachine at jvmaccess@@UEAA at XZ; # jvmaccess::VirtualMachine::AttachGuard::CreationException::~CreationException()
+        ??4CreationException at AttachGuard@VirtualMachine at jvmaccess@@QEAAAEAV0123 at AEBV0123@@Z; # jvmaccess::VirtualMachine::AttachGuard::CreationException::operator =(CreationException const &)
+        ??0AttachGuard at VirtualMachine@jvmaccess@@QEAA at AEBV?$Reference at VVirtualMachine@jvmaccess@@@rtl@@@Z; # jvmaccess::VirtualMachine::AttachGuard::AttachGuard(rtl::Reference< VirtualMachine > const &)
+        ??1AttachGuard at VirtualMachine@jvmaccess@@QEAA at XZ; # jvmaccess::VirtualMachine::AttachGuard::~AttachGuard()
+    ??0VirtualMachine at jvmaccess@@QEAA at PEAUJavaVM_@@H_NPEAUJNIEnv_@@@Z; # jvmaccess::VirtualMachine::VirtualMachine(JavaVM *, int, bool, JNIEnv *)
+
+    local:
+        *;
+};
+
+UDK_3.2 {
+    global:
+} UDK_3.1;
+
+UDK_3.3 {
+    global:
+        # jvmaccess/unovirtualmachine.hxx:
+        ??0CreationException at UnoVirtualMachine@jvmaccess@@QEAA at AEBV012@@Z; # jvmaccess::UnoVirtualMachine::CreationException::CreationException(CreationException const &)
+        ??0CreationException at UnoVirtualMachine@jvmaccess@@QEAA at XZ; # jvmaccess::UnoVirtualMachine::CreationException::CreationException()
+        ??1CreationException at UnoVirtualMachine@jvmaccess@@UEAA at XZ; # jvmaccess::UnoVirtualMachine::CreationException::~CreationException()
+        ??4CreationException at UnoVirtualMachine@jvmaccess@@QEAAAEAV012 at AEBV012@@Z; # jvmaccess::UnoVirtualMachine::CreationException::operator =(CreationException const &)
+        ??0UnoVirtualMachine at jvmaccess@@QEAA at AEBV?$Reference at VVirtualMachine@jvmaccess@@@rtl@@PEAX at Z; # jvmaccess::UnoVirtualMachine::UnoVirtualMachine(rtl::Reference< jvmaccess::VirtualMachine > const &, void *)
+        ?getVirtualMachine at UnoVirtualMachine@jvmaccess@@QEBA?AV?$Reference at VVirtualMachine@jvmaccess@@@rtl@@XZ; # jvmaccess::UnoVirtualMachine::getVirtualMachine() const
+        ?getClassLoader at UnoVirtualMachine@jvmaccess@@QEBAPEAXXZ; # jvmaccess::UnoVirtualMachine::getClassLoader() const
+} UDK_3.2;
+
+UDK_3.4 { # OOo 2.3
+    global:
+        # jvmaccess/classpath.hxx:
+        ?doLoadClass at ClassPath@jvmaccess@@CAPEAXAEBV?$Reference at VXComponentContext@uno at star@sun at com@@@uno at star@sun at com@@PEAXAEBVOUString at rtl@@2 at Z; # jvmaccess::ClassPath::doLoadClass(com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > const &, void *, rtl::OUString const &, rtl::OUString const &)
+        ?doTranslateToUrls at ClassPath@jvmaccess@@CAPEAXAEBV?$Reference at VXComponentContext@uno at star@sun at com@@@uno at star@sun at com@@PEAXAEBVOUString at rtl@@@Z; # jvmaccess::ClassPath::doTranslateToUrls(com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > const &, void *, rtl::OUString const &)
+} UDK_3.3;