[Libreoffice-commits] .: sal/inc sal/osl sal/systools

[Tor Lillqvist]

 sal/inc/osl/endian.h                   |    2 ++
 sal/osl/w32/file.cxx                   |    4 ++--
 sal/systools/win32/uwinapi/makefile.mk |   21 +++++++++++----------
 3 files changed, 15 insertions(+), 12 deletions(-)

New commits:
commit 60f523c253e988d310ca2e14aff817e916ad2e7e
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Sun Jan 16 21:57:00 2011 +0200

    Initial hacks for 64-bit Windows build

diff --git a/sal/inc/osl/endian.h b/sal/inc/osl/endian.h
index 157409b..ffbf08e 100644
--- a/sal/inc/osl/endian.h
+++ b/sal/inc/osl/endian.h
@@ -40,6 +40,8 @@ extern "C" {
 #ifdef _WIN32
 #	if defined(_M_IX86)
 #		define _LITTLE_ENDIAN
+#	elif defined(_M_AMD64)
+#		define _LITTLE_ENDIAN
 #	elif defined(_M_MRX000)
 #		define _LITTLE_ENDIAN
 #	elif defined(_M_ALPHA)
diff --git a/sal/osl/w32/file.cxx b/sal/osl/w32/file.cxx
index d42b0ad..1a30f12 100644
--- a/sal/osl/w32/file.cxx
+++ b/sal/osl/w32/file.cxx
@@ -425,7 +425,7 @@ oslFileError FileHandle_Impl::readFileAt (
                 return osl_File_E_None;
             }
 
-            SIZE_T const bytes = std::min(m_buflen - bufpos, nBytesRequested);
+            SIZE_T const bytes = std::min(m_buflen - bufpos, (SIZE_T) nBytesRequested);
             memcpy (&(buffer[*pBytesRead]), &(m_buffer[bufpos]), bytes);
             nBytesRequested -= bytes, *pBytesRead += bytes, nOffset += bytes;
         }
@@ -495,7 +495,7 @@ oslFileError FileHandle_Impl::writeFileAt (
                 m_bufptr = bufptr, m_buflen = sal::static_int_cast< SIZE_T >(uDone);
             }
 
-            SIZE_T const bytes = std::min(m_bufsiz - bufpos, nBytesToWrite);
+            SIZE_T const bytes = std::min(m_bufsiz - bufpos, (SIZE_T) nBytesToWrite);
             memcpy (&(m_buffer[bufpos]), &(buffer[*pBytesWritten]), bytes);
             nBytesToWrite -= bytes, *pBytesWritten += bytes, nOffset += bytes;
 
diff --git a/sal/systools/win32/uwinapi/makefile.mk b/sal/systools/win32/uwinapi/makefile.mk
old mode 100755
new mode 100644
index 57faa5c..b086228
--- a/sal/systools/win32/uwinapi/makefile.mk
+++ b/sal/systools/win32/uwinapi/makefile.mk
@@ -47,14 +47,11 @@ CXXFLAGS+= $(LFS_CFLAGS)
 CFLAGSCXX+=-Wno-unused-parameter -Wno-return-type
 .ENDIF
 
-.IF "$(COMEX)"=="9"
-.IF "$(PSDK_HOME)"!=""
-# Since the 02/2003 PSDK the "new" linker is needed here.
-LINK=$(WRAPCMD) "$(PSDK_HOME)$/Bin$/Win64$/LINK.EXE"
-.ENDIF
-.ENDIF
+SLOFILES=
+
+.IF "$(CPU)"=="I"
 
-SLOFILES=\
+SLOFILES+=\
         $(SLO)$/CheckTokenMembership.obj\
         $(SLO)$/CommandLineToArgvW.obj\
         $(SLO)$/CopyFileExA.obj\
@@ -79,8 +76,6 @@ SLOFILES=\
         $(SLO)$/DllMain.obj\
         $(SLO)$/ResolveThunk.obj\
         $(SLO)$/ResolveUnicows.obj\
-        $(SLO)$/snprintf.obj\
-        $(SLO)$/snwprintf.obj\
         $(SLO)$/FindFirstVolumeA.obj\
         $(SLO)$/FindFirstVolumeW.obj\
         $(SLO)$/FindNextVolumeA.obj\
@@ -111,7 +106,13 @@ SLOFILES=\
         $(SLO)$/PathSetDlgItemPathW.obj\
         $(SLO)$/PathStripToRootW.obj\
         $(SLO)$/SHCreateItemFromParsingName.obj
-        
+
+.ENDIF
+
+SLOFILES+=\
+        $(SLO)$/snprintf.obj\
+        $(SLO)$/snwprintf.obj
+
 SHL1TARGET=$(TARGET)
 SHL1IMPLIB=$(SHL1TARGET)
 SHL1DEF=$(MISC)/$(SHL1TARGET).def